uncrustify-trinity: updated based on upstream version 0.76.0

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

4867 files changed, 31879 insertions, 18321 deletions

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/workflows/uncrustify_test.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/workflows/uncrustify_test.yml
deleted file mode 100644
index a7fab544..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/workflows/uncrustify_test.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-
-name: uncrustify_test
-on: [push, pull_request]
-
-# Cancel any in-progress CI runs for a PR if it is updated
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  check-uncrustify:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: cmake-part-and-tests
-        env:
-          BADGE: linux
-        run: mkdir build;
-          cd build;
-          cmake -DCMAKE_BUILD_TYPE=Release ..;
-          make;
-          ../scripts/run_ctest.py
-
-
-  debug-ninja-uncrustify:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: seanmiddleditch/gha-setup-ninja@master
-      - name: cmake-part-and-tests
-        env:
-          BADGE: linux
-        run: mkdir build;
-          cd build;
-          cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..;
-          ninja;
-          ../scripts/run_ctest.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CODEOWNERS b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CODEOWNERS
deleted file mode 100644
index 56414821..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CODEOWNERS
+++ /dev/null
@@ -1,11 +0,0 @@
-*               @gmaurel @mwoehlke-kitware @micheleCTDEAdmin
-
-.editorconfig   @mihaipopescu
-
-# CI
-.travis.yml     @mihaipopescu
-appveyor.yml    @mihaipopescu
-
-# emscripten
-#/emscripten/    @CDanU
-#/src/uncrustify_emscripten.cpp @CDanU
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/Comments.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/Comments.txt
deleted file mode 100644
index 5375e829..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/Comments.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-2016-04-25
-
-While a line is indented, the comment at the end of the line stays at the original column.
-
-If we have:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))
-      {                  // guy 2016-04-16
-
-where the brace { is at new line with a comment.
-The option nl_elseif_brace = remove
-gives:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-                 (pc->type == CT_FUNC_DEF) ||
-                 (pc->type == CT_FUNC_CLASS_PROTO) ||
-                 (pc->type == CT_FUNC_PROTO)) { // guy 2016-04-16
-If using at new the same option again with a new value
-nl_elseif_brace = add
-is not able to reconstruct the original source. The comment has changed the line:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))       // guy 2016-04-16
-      {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw32.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw32.cmake
deleted file mode 100644
index 218d9501..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw32.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Toolchain file for cross-compiling from Linux to Win32 using MinGW
-#
-
-set(CMAKE_SYSTEM_NAME Windows)
-
-if(COMPILER_PREFIX STREQUAL "")
-  if(EXISTS /usr/i686-w64-mingw32)
-    # mingw-w64
-    set(COMPILER_PREFIX "i686-w64-mingw32")
-  elseif(EXISTS /usr/i586-mingw32msvc)
-    # mingw
-    set(COMPILER_PREFIX "i586-mingw32msvc")
-  else()
-    message(FATAL_ERROR "Unable to detect cross-compiler prefix (COMPILER_PREFIX)")
-  endif()
-endif()
-
-find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
-find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
-find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
-
-set(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw64.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw64.cmake
deleted file mode 100644
index 4ec9c43a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw64.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Toolchain file for cross-compiling from Linux to Win64 using MinGW
-#
-
-set(CMAKE_SYSTEM_NAME Windows)
-
-if(COMPILER_PREFIX STREQUAL "")
-  if(EXISTS /usr/x86_64-w64-mingw32)
-    # mingw-w64
-    set(COMPILER_PREFIX "x86_64-w64-mingw32")
-  elseif(EXISTS /usr/amd64-mingw32msvc-gcc)
-    # mingw
-    set(COMPILER_PREFIX "amd64-mingw32msvc-gcc")
-  else()
-    message(FATAL_ERROR "Unable to detect cross-compiler prefix (COMPILER_PREFIX)")
-  endif()
-endif()
-
-find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
-find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
-find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
-
-set(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ListManager.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ListManager.h
deleted file mode 100644
index f9e928c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ListManager.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * @file ListManager.h
- * Template class that manages items in a double-linked list.
- * If C++ could do it, this would just be a class that worked on an interface.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef LIST_MANAGER_H_INCLUDED
-#define LIST_MANAGER_H_INCLUDED
-
-/*
- * TODO: why do we provide this template class? can't we use
- * a double linked list std::deque from the standard library ?
- */
-/**
- * A simple list manager for a double-linked list.
- * Class T must define 'next' and 'prev', which must be pointers to type T.
- */
-template<class T>
-class ListManager
-{
-protected:
-   T *first; //! pointer to the head of list
-   T *last;  //! pointer to tail of list
-
-private:
-   // Hide copy constructor
-   ListManager(const ListManager &ref)
-   {
-      first = nullptr;
-      last  = nullptr;
-   }
-
-public:
-   ListManager()
-   {
-      first = nullptr;
-      last  = nullptr;
-   }
-
-
-   /**
-    * @brief return the first element of the linked list
-    *
-    * @return pointer to first element or nullptr if list is empty
-    */
-   T *GetHead() const
-   {
-      return(first);
-   }
-
-
-   /**
-    * @brief return the last element of the linked list
-    *
-    * @return pointer to last element or nullptr if list is empty
-    */
-   T *GetTail() const
-   {
-      return(last);
-   }
-
-
-   /**
-    *  @brief return the next element of the linked list
-    *
-    * @param[in] ref  pointer to current list element
-    *
-    * @return pointer to next element or nullptr if no next element exists
-    */
-   T *GetNext(const T *ref) const
-   {
-      return((ref != nullptr) ? ref->next : nullptr);
-   }
-
-
-   /**
-    * @brief return the previous element of the linked list
-    *
-    * @param[in] ref  pointer to current list element
-    *
-    * @return pointer to previous element or nullptr if no previous element exists
-    */
-   T *GetPrev(const T *ref) const
-   {
-      return((ref != nullptr) ? ref->prev : nullptr);
-   }
-
-
-   /**
-    * @brief remove an element from a linked list
-    *
-    * @param[in] obj  list element to remove
-    */
-   void Pop(T *obj)
-   {
-      if (obj != nullptr)
-      {
-         if (first == obj)
-         {
-            first = obj->next;
-         }
-
-         if (last == obj)
-         {
-            last = obj->prev;
-         }
-
-         if (obj->next != nullptr)
-         {
-            obj->next->prev = obj->prev;
-         }
-
-         if (obj->prev != nullptr)
-         {
-            obj->prev->next = obj->next;
-         }
-         obj->next = nullptr;
-         obj->prev = nullptr;
-      }
-   }
-
-
-   //! swap two elements of a list
-   void Swap(T *obj1, T *obj2)
-   {
-      if (  obj1 != nullptr
-         && obj2 != nullptr)
-      {
-         if (obj1->prev == obj2)
-         {
-            Pop(obj1);
-            AddBefore(obj1, obj2);
-         }
-         else if (obj2->prev == obj1)
-         {
-            Pop(obj2);
-            AddBefore(obj2, obj1);
-         }
-         else
-         {
-            T *prev1 = obj1->prev;
-            Pop(obj1);
-
-            T *prev2 = obj2->prev;
-            Pop(obj2);
-
-            AddAfter(obj1, prev2);
-            AddAfter(obj2, prev1);
-         }
-      }
-   }
-
-
-   /**
-    * @brief add a new element after a reference position in a list
-    *
-    * @param obj  new element to add to list
-    * @param ref  chunk after which to insert new object
-    */
-   void AddAfter(T *obj, T *ref)
-   {
-      if (  obj != nullptr
-         && ref != nullptr)
-      {
-         Pop(obj); // TODO: is this necessary?
-         obj->next = ref->next;
-         obj->prev = ref;
-
-         if (ref->next != nullptr)
-         {
-            ref->next->prev = obj;
-         }
-         else
-         {
-            last = obj;
-         }
-         ref->next = obj;
-      }
-   }
-
-
-   /**
-    * @brief add a new element before a reference position in a list
-    *
-    * @param obj  new element to add to list
-    * @param ref  chunk before to insert new object
-    */
-   void AddBefore(T *obj, T *ref)
-   {
-      if (  obj != nullptr
-         && ref != nullptr)
-      {
-         Pop(obj);
-         obj->next = ref;
-         obj->prev = ref->prev;
-
-         if (ref->prev != nullptr)
-         {
-            ref->prev->next = obj;
-         }
-         else
-         {
-            first = obj;
-         }
-         ref->prev = obj;
-      }
-   }
-
-
-   /**
-    * @brief add a new element to the tail of a lis
-    *
-    * @param obj  new element to add to the list
-    */
-   void AddTail(T *obj)
-   {
-      obj->next = nullptr;
-      obj->prev = last;
-
-      if (last == nullptr)
-      {
-         last  = obj;
-         first = obj;
-      }
-      else
-      {
-         last->next = obj;
-      }
-      last = obj;
-   }
-
-
-   /**
-    * @brief add a new element to the head of a list
-    *
-    * @param obj  new element to add to the list
-    */
-   void AddHead(T *obj)
-   {
-      obj->next = first;
-      obj->prev = nullptr;
-
-      if (first == nullptr)
-      {
-         last  = obj;
-         first = obj;
-      }
-      else
-      {
-         first->prev = obj;
-      }
-      first = obj;
-   }
-};
-
-
-#endif /* LIST_MANAGER_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.cpp
deleted file mode 100644
index 6fe3191d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @file align_add.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_add.h"
-#include "uncrustify.h"
-
-
-void align_add(ChunkStack &cs, Chunk *pc, size_t &max_col)
-{
-   LOG_FUNC_ENTRY();
-
-   size_t min_col;
-   Chunk  *prev = Chunk::NullChunkPtr;
-
-   if (pc != nullptr)
-   {
-      prev = pc->GetPrev();
-   }
-
-   if (  prev->IsNullChunk()
-      || chunk_is_newline(prev))
-   {
-      min_col = 1;
-      LOG_FMT(LALADD, "%s(%d): pc->orig_line=%zu, pc->col=%zu max_col=%zu min_col=%zu\n",
-              __func__, __LINE__, pc->orig_line, pc->column, max_col, min_col);
-   }
-   else
-   {
-      if (chunk_is_token(prev, CT_COMMENT_MULTI))
-      {
-         min_col = prev->orig_col_end + 1;
-      }
-      else
-      {
-         min_col = prev->column + prev->Len() + 1;
-      }
-      LOG_FMT(LALADD, "%s(%d): pc->orig_line=%zu, pc->col=%zu max_col=%zu min_col=%zu multi:%s prev->col=%zu prev->Len()=%zu %s\n",
-              __func__, __LINE__, pc->orig_line, pc->column, max_col, min_col, (chunk_is_token(prev, CT_COMMENT_MULTI)) ? "Y" : "N",
-              (chunk_is_token(prev, CT_COMMENT_MULTI)) ? prev->orig_col_end : (UINT32)prev->column, prev->Len(), get_token_name(prev->type));
-   }
-
-   if (cs.Empty())
-   {
-      max_col = 0;
-   }
-   cs.Push_Back(pc);
-
-   if (min_col > max_col)
-   {
-      max_col = min_col;
-   }
-} // align_add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.cpp
deleted file mode 100644
index cd08e53f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * @file align_assign.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_assign.h"
-
-#include "align_stack.h"
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LALASS;
-
-using namespace uncrustify;
-
-
-Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  first == nullptr
-      || first->IsNullChunk())
-   {
-      // coveralls will complain here. There are no example for that.
-      // see https://en.wikipedia.org/wiki/Robustness_principle
-      return(nullptr);
-   }
-   size_t my_level = first->level;
-
-   char   copy[1000];
-
-   LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig_line %zu, span is %zu, thresh is %zu\n",
-           __func__, __LINE__, my_level, first->ElidedText(copy), first->orig_line, span, thresh);
-
-   // If we are aligning on a tabstop, we shouldn't right-align
-   AlignStack as;    // regular assigns
-
-   as.Start(span, thresh);
-   log_rule_B("align_on_tabstop");
-   as.m_right_align = !options::align_on_tabstop();
-
-   AlignStack vdas;  // variable def assigns
-
-   vdas.Start(span, thresh);
-   vdas.m_right_align = as.m_right_align;
-
-   std::deque<AlignStack> fcnDefault(1);
-
-   fcnDefault.back().Start(span, thresh);
-   fcnDefault.back().m_right_align = as.m_right_align;
-
-   AlignStack fcnProto;
-
-   fcnProto.Start(span, thresh);
-   fcnProto.m_right_align = as.m_right_align;
-
-   size_t var_def_cnt = 0;
-   size_t equ_count   = 0;
-   size_t fcn_idx     = 0;
-   size_t tmp;
-   Chunk  *pc = first;
-
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
-   {
-      LOG_FMT(LALASS, "%s(%d): orig_line is %zu, check pc->Text() '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->ElidedText(copy), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
-
-      // Don't check inside SPAREN, PAREN or SQUARE groups
-      if (  chunk_is_token(pc, CT_SPAREN_OPEN)
-            // || chunk_is_token(pc, CT_FPAREN_OPEN) Issue #1340
-         || chunk_is_token(pc, CT_SQUARE_OPEN)
-         || chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         LOG_FMT(LALASS, "%s(%d): Don't check inside SPAREN, PAREN or SQUARE groups, type is %s\n",
-                 __func__, __LINE__, get_token_name(pc->type));
-         tmp = pc->orig_line;
-         pc  = chunk_skip_to_match(pc);
-
-         if (pc != nullptr)
-         {
-            as.NewLines(pc->orig_line - tmp);
-            vdas.NewLines(pc->orig_line - tmp);
-
-            if (pc->orig_line != tmp)
-            {
-               fcn_idx = 0;
-
-               for (auto &fcn : fcnDefault)
-               {
-                  fcn.NewLines(pc->orig_line - tmp);
-               }
-            }
-            fcnProto.NewLines(pc->orig_line - tmp);
-         }
-         continue;
-      }
-
-      // Recurse if a brace set is found
-      if (  (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_token(pc, CT_VBRACE_OPEN))
-         && !(get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST))
-      {
-         size_t myspan;
-         size_t mythresh;
-
-         size_t sub_nl_count = 0;
-
-         if (get_chunk_parent_type(pc) == CT_ENUM)
-         {
-            log_rule_B("align_enum_equ_span");
-            myspan = options::align_enum_equ_span();
-            log_rule_B("align_enum_equ_thresh");
-            mythresh = options::align_enum_equ_thresh();
-         }
-         else
-         {
-            log_rule_B("align_assign_span");
-            myspan = options::align_assign_span();
-            log_rule_B("align_assign_thresh");
-            mythresh = options::align_assign_thresh();
-         }
-         pc = align_assign(pc->GetNextNcNnl(), myspan, mythresh, &sub_nl_count);
-
-         if (sub_nl_count > 0)
-         {
-            as.NewLines(sub_nl_count);
-            vdas.NewLines(sub_nl_count);
-            fcn_idx = 0;
-
-            for (auto &fcn : fcnDefault)
-            {
-               fcn.NewLines(sub_nl_count);
-            }
-
-            fcnProto.NewLines(sub_nl_count);
-
-            if (p_nl_count != nullptr)
-            {
-               *p_nl_count += sub_nl_count;
-            }
-         }
-         continue;
-      }
-
-      // Done with this brace set?
-      if (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            || chunk_is_token(pc, CT_VBRACE_CLOSE))
-         && !(get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST))
-      {
-         pc = pc->GetNext();
-         break;
-      }
-
-      if (chunk_is_newline(pc))
-      {
-         as.NewLines(pc->nl_count);
-         vdas.NewLines(pc->nl_count);
-         fcn_idx = 0;
-
-         for (auto &fcn : fcnDefault)
-         {
-            fcn.NewLines(pc->nl_count);
-         }
-
-         fcnProto.NewLines(pc->nl_count);
-
-         if (p_nl_count != nullptr)
-         {
-            *p_nl_count += pc->nl_count;
-         }
-         var_def_cnt = 0;
-         equ_count   = 0;
-      }
-      else if (  pc->flags.test(PCF_VAR_DEF)
-              && !pc->flags.test(PCF_IN_CONST_ARGS) // Issue #1717
-              && !pc->flags.test(PCF_IN_FCN_DEF)    // Issue #1717
-              && !pc->flags.test(PCF_IN_FCN_CALL))  // Issue #1717
-      {
-         // produces much more log output. Use it only debugging purpose
-         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags:\n   ", __func__, __LINE__);
-         //log_pcf_flags(LALASS, pc->flags);
-         var_def_cnt++;
-      }
-      else if (  var_def_cnt > 1
-              && !options::align_assign_on_multi_var_defs())
-      {
-         // 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.Reset();
-      }
-      else if (  equ_count == 0                      // indent only if first '=' in line
-              && !pc->flags.test(PCF_IN_TEMPLATE)    // and it is not inside a template #999
-              && (  chunk_is_token(pc, CT_ASSIGN)
-                 || chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG)
-                 || chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO)))
-      {
-         if (chunk_is_token(pc, CT_ASSIGN))               // Issue #2236
-         {
-            equ_count++;
-         }
-         LOG_FMT(LALASS, "%s(%d): align_assign_decl_func() is %d\n",
-                 __func__, __LINE__, options::align_assign_decl_func());
-         // produces much more log output. Use it only debugging purpose
-         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags: ", __func__, __LINE__);
-         //log_pcf_flags(LALASS, pc->flags);
-
-         log_rule_B("align_assign_decl_func");
-
-         if (  options::align_assign_decl_func() == 0         // Align with other assignments (default)
-            && (  chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG)   // Foo( int bar = 777 );
-               || chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO)))  // Foo( const Foo & ) = delete;
-         {
-            LOG_FMT(LALASS, "%s(%d): fcnDefault[%zu].Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, fcn_idx, pc->Text(), pc->orig_line, pc->orig_col);
-
-            if (++fcn_idx == fcnDefault.size())
-            {
-               fcnDefault.emplace_back();
-               fcnDefault.back().Start(span, thresh);
-               fcnDefault.back().m_right_align = as.m_right_align;
-            }
-            fcnDefault[fcn_idx].Add(pc);
-         }
-         else if (options::align_assign_decl_func() == 1)   // Align with each other
-         {
-            log_rule_B("align_assign_decl_func");
-
-            if (chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG))  // Foo( int bar = 777 );
-            {
-               LOG_FMT(LALASS, "%s(%d): default: fcnDefault[%zu].Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, fcn_idx, pc->Text(), pc->orig_line, pc->orig_col);
-
-               if (++fcn_idx == fcnDefault.size())
-               {
-                  fcnDefault.emplace_back();
-                  fcnDefault.back().Start(span, thresh);
-                  fcnDefault.back().m_right_align = as.m_right_align;
-               }
-               fcnDefault[fcn_idx].Add(pc);
-            }
-            else if (chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO))  // Foo( const Foo & ) = delete;
-            {
-               LOG_FMT(LALASS, "%s(%d): proto: fcnProto.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
-               fcnProto.Add(pc);
-            }
-            else if (chunk_is_token(pc, CT_ASSIGN)) // Issue #2197
-            {
-               LOG_FMT(LALASS, "%s(%d): vdas.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
-               vdas.Add(pc);
-            }
-         }
-         else if (  options::align_assign_decl_func() == 2         // Don't align
-                 && (  chunk_is_token(pc, CT_ASSIGN_DEFAULT_ARG)   // Foo( int bar = 777 );
-                    || chunk_is_token(pc, CT_ASSIGN_FUNC_PROTO)))  // Foo( const Foo & ) = delete;
-         {
-            log_rule_B("align_assign_decl_func");
-            LOG_FMT(LALASS, "%s(%d): Don't align\n",               // Issue #2236
-                    __func__, __LINE__);
-         }
-         else if (var_def_cnt != 0)
-         {
-            LOG_FMT(LALASS, "%s(%d): vdas.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
-            vdas.Add(pc);
-         }
-         else
-         {
-            if (chunk_is_token(pc, CT_ASSIGN))
-            {
-               LOG_FMT(LALASS, "%s(%d): as.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
-               as.Add(pc);
-            }
-         }
-      }
-      pc = pc->GetNext();
-   }
-   as.End();
-   vdas.End();
-
-   for (auto &fcn : fcnDefault)
-   {
-      fcn.End();
-   }
-
-   fcnProto.End();
-
-   if (pc != nullptr)
-   {
-      LOG_FMT(LALASS, "%s(%d): done on '%s' on orig_line %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line);
-   }
-   else
-   {
-      LOG_FMT(LALASS, "%s(%d): done on NULL\n", __func__, __LINE__);
-   }
-   return(pc);
-} // align_assign
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.cpp
deleted file mode 100644
index 0ad879b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.cpp
+++ /dev/null
@@ -1,1167 +0,0 @@
-/**
- * @file chunk.cpp
- * Manages and navigates the list of chunks.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "chunk.h"
-
-#include "ListManager.h"
-#include "prototypes.h"
-#include "space.h"
-
-typedef ListManager<Chunk> ChunkList_t;
-
-
-ChunkList_t g_cl; //! global chunk list
-
-
-/*
- * Chunk class methods
- */
-
-// Null Chunk
-Chunk        Chunk::NullChunk(true);
-Chunk *const Chunk::NullChunkPtr(&Chunk::NullChunk);
-
-
-Chunk::Chunk(bool null_c)
-   : null_chunk(null_c)
-{
-   Reset();
-}
-
-
-Chunk::Chunk(const Chunk &o)
-   : null_chunk(o.null_chunk)
-{
-   copyFrom(o);
-}
-
-
-Chunk &Chunk::operator=(const Chunk &o)
-{
-   if (this != &o)
-   {
-      copyFrom(o);
-   }
-   return(*this);
-}
-
-
-void Chunk::copyFrom(const Chunk &o)
-{
-   next        = nullptr;
-   prev        = nullptr;
-   parent      = nullptr;
-   align       = o.align;
-   indent      = o.indent;
-   type        = o.type;
-   parent_type = o.parent_type;
-
-   orig_line     = o.orig_line;
-   orig_col      = o.orig_col;
-   orig_col_end  = o.orig_col_end;
-   orig_prev_sp  = o.orig_prev_sp;
-   flags         = o.flags;
-   column        = o.column;
-   column_indent = o.column_indent;
-
-   nl_count  = o.nl_count;
-   nl_column = o.nl_column;
-   level     = o.level;
-
-   brace_level = o.brace_level;
-   pp_level    = o.pp_level;
-   after_tab   = o.after_tab;
-   str         = o.str;
-
-   tracking = o.tracking;
-}
-
-
-void Chunk::Reset()
-{
-   memset(&align, 0, sizeof(align));
-   memset(&indent, 0, sizeof(indent));
-   next          = nullptr;
-   prev          = nullptr;
-   parent        = nullptr;
-   type          = CT_NONE;
-   parent_type   = CT_NONE;
-   orig_line     = 0;
-   orig_col      = 0;
-   orig_col_end  = 0;
-   orig_prev_sp  = 0;
-   flags         = PCF_NONE;
-   column        = 0;
-   column_indent = 0;
-   nl_count      = 0;
-   nl_column     = 0;
-   level         = 0;
-   brace_level   = 0;
-   pp_level      = 999;                                // use a big value to find some errors
-   after_tab     = false;
-   // for debugging purpose only
-   tracking = nullptr;
-   str.clear();
-}
-
-
-size_t Chunk::Len() const
-{
-   return(str.size());
-}
-
-
-const char *Chunk::Text() const
-{
-   return(str.c_str());
-}
-
-
-const char *Chunk::ElidedText(char *for_the_copy) const
-{
-   const char *test_it       = Text();
-   size_t     test_it_length = strlen(test_it);
-
-   size_t     truncate_value = uncrustify::options::debug_truncate();
-
-   if (truncate_value != 0)
-   {
-      if (test_it_length > truncate_value)
-      {
-         memset(for_the_copy, 0, 1000);
-
-         if (test_it_length < truncate_value + 30)
-         {
-            strncpy(for_the_copy, test_it, truncate_value - 30);
-            for_the_copy[truncate_value - 30] = 0;
-         }
-         else
-         {
-            strncpy(for_the_copy, test_it, truncate_value);
-            for_the_copy[truncate_value] = 0;
-         }
-         char *message = strcat(for_the_copy, " ... <The string is truncated>");
-
-         return(message);
-      }
-      else
-      {
-         return(test_it);
-      }
-   }
-   return(test_it);
-}
-
-
-Chunk *Chunk::GetNext(const E_Scope scope) const
-{
-   if (IsNullChunk())
-   {
-      return(NullChunkPtr);
-   }
-   Chunk *pc = g_cl.GetNext(this);
-
-   if (  pc == nullptr
-      || pc->IsNullChunk())
-   {
-      return(NullChunkPtr);
-   }
-
-   if (scope == E_Scope::ALL)
-   {
-      return(pc);
-   }
-
-   if (flags.test(PCF_IN_PREPROC))
-   {
-      // If in a preproc, return a null chunk if trying to leave
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         return(NullChunkPtr);
-      }
-      return(pc);
-   }
-
-   // Not in a preproc, skip any preproc
-   while (  pc != nullptr
-         && pc->IsNotNullChunk()
-         && pc->flags.test(PCF_IN_PREPROC))
-   {
-      pc = g_cl.GetNext(pc);
-   }
-
-   if (  pc == nullptr
-      || pc->IsNullChunk())
-   {
-      return(NullChunkPtr);
-   }
-   return(pc);
-} // Chunk::GetNext
-
-
-Chunk *Chunk::GetPrev(const E_Scope scope) const
-{
-   if (IsNullChunk())
-   {
-      return(NullChunkPtr);
-   }
-   Chunk *pc = g_cl.GetPrev(this);
-
-   if (  pc == nullptr
-      || pc->IsNullChunk())
-   {
-      return(NullChunkPtr);
-   }
-
-   if (scope == E_Scope::ALL)
-   {
-      return(pc);
-   }
-
-   if (flags.test(PCF_IN_PREPROC))
-   {
-      // If in a preproc, return a null chunk if trying to leave
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         return(NullChunkPtr);
-      }
-      return(pc);
-   }
-
-   // Not in a preproc, skip any preproc
-   while (  pc != nullptr
-         && pc->IsNotNullChunk()
-         && pc->flags.test(PCF_IN_PREPROC))
-   {
-      pc = g_cl.GetPrev(pc);
-   }
-
-   if (  pc == nullptr
-      || pc->IsNullChunk())
-   {
-      return(NullChunkPtr);
-   }
-   return(pc);
-} // Chunk::GetPrev
-
-
-static void chunk_log(Chunk *pc, const char *text);
-
-
-/*
- * TODO: if we use C++ we can overload the following two functions
- * and thus name them equally
- */
-
-/**
- * @brief search a chunk of a given category in a chunk list
- *
- * traverses a chunk list either in forward or backward direction.
- * The traversal continues until a chunk of a given category is found.
- *
- * This function is a specialization of Chunk::Search.
- *
- * @param cur    chunk to start search at
- * @param type   category to search for
- * @param scope  code parts to consider for search
- * @param dir    search direction
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval Chunk  pointer to the found chunk
- */
-static Chunk *chunk_search_type(Chunk *cur, const E_Token type, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD);
-
-
-/**
- * @brief Add a new chunk before/after the given position in a chunk list
- *
- * If ref is nullptr, add either at the head or tail based on the specified pos
- *
- * @param  pc_in  chunk to add to list
- * @param  ref    insert position in list
- * @param  pos    insert before or after
- *
- * @return Chunk  pointer to the added chunk
- */
-static Chunk *chunk_add(const Chunk *pc_in, Chunk *ref, const E_Direction pos = E_Direction::FORWARD);
-
-
-Chunk *Chunk::GetHead(void)
-{
-   Chunk *ret = g_cl.GetHead();
-
-   if (ret == nullptr)
-   {
-      return(Chunk::NullChunkPtr);
-   }
-   return(ret);
-}
-
-
-Chunk *Chunk::GetTail(void)
-{
-   Chunk *ret = g_cl.GetTail();
-
-   if (ret == nullptr)
-   {
-      return(Chunk::NullChunkPtr);
-   }
-   return(ret);
-}
-
-
-Chunk::T_SearchFnPtr Chunk::GetSearchFn(const E_Direction dir)
-{
-   return((dir == E_Direction::FORWARD) ? &Chunk::GetNext : &Chunk::GetPrev);
-}
-
-
-Chunk *Chunk::Search(const T_CheckFnPtr checkFn, const E_Scope scope,
-                     const E_Direction dir, const bool cond) const
-{
-   T_SearchFnPtr searchFnPtr = GetSearchFn(dir);
-   Chunk         *pc         = const_cast<Chunk *>(this);
-
-   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->*checkFn)() != cond)); // and the demanded chunk was not found either
-
-   return(pc);                             // the latest chunk is the searched one
-}
-
-
-Chunk *chunk_search_prev_cat(Chunk *pc, const E_Token cat)
-{
-   return(chunk_search_type(pc, cat, E_Scope::ALL, E_Direction::BACKWARD));
-}
-
-
-Chunk *chunk_search_next_cat(Chunk *pc, const E_Token cat)
-{
-   return(chunk_search_type(pc, cat, E_Scope::ALL, E_Direction::FORWARD));
-}
-
-
-bool are_chunks_in_same_line(Chunk *start, Chunk *end)
-{
-   if (start == nullptr)
-   {
-      return(false);
-   }
-   Chunk *tmp = start->GetNext();
-
-   while (  tmp->IsNotNullChunk()
-         && tmp != end)
-   {
-      if (chunk_is_token(tmp, CT_NEWLINE))
-      {
-         return(false);
-      }
-      tmp = tmp->GetNext();
-   }
-   return(true);
-}
-
-
-static Chunk *chunk_search_type(Chunk *cur, const E_Token type,
-                                const E_Scope scope, const E_Direction dir)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction
-    */
-   Chunk::T_SearchFnPtr search_function = Chunk::GetSearchFn(dir);
-   Chunk                *pc             = cur;
-
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
-   do                                     // loop over the chunk list
-   {
-      pc = (pc->*search_function)(scope); // in either direction while
-   } while (  pc->IsNotNullChunk()        // the end of the list was not reached yet
-           && pc->type != type);          // and the demanded chunk was not found either
-
-   if (pc->IsNullChunk())
-   {
-      pc = nullptr;
-   }
-   return(pc);                            // the latest chunk is the searched one
-}
-
-
-Chunk *Chunk::SearchTypeLevel(const E_Token cType, const E_Scope scope,
-                              const E_Direction dir, const int cLevel) const
-{
-   T_SearchFnPtr searchFnPtr = GetSearchFn(dir);
-   Chunk         *pc         = const_cast<Chunk *>(this);
-
-   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->IsTypeAndLevel(cType, cLevel))); // and the chunk was not found either
-
-   return(pc);                                       // the latest chunk is the searched one
-}
-
-
-Chunk *Chunk::SearchStringLevel(const char *cStr, const size_t len, int cLevel,
-                                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
-   {
-      pc = (pc->*searchFnPtr)(scope);                // in either direction while
-   } while (  pc->IsNotNullChunk()                       // the end of the list was not reached yet
-           && !pc->IsStringAndLevel(cStr, len, cLevel)); // and the demanded chunk was not found either
-
-   return(pc);                                           // the latest chunk is the searched one
-}
-
-
-Chunk *Chunk::SearchPpa(const T_CheckFnPtr checkFn, const bool cond) const
-{
-   if (!flags.test(PCF_IN_PREPROC))
-   {
-      // if not in preprocessor, do a regular search
-      return(Search(checkFn, E_Scope::ALL, E_Direction::FORWARD, cond));
-   }
-   Chunk *pc = GetNext();
-
-   while (pc->IsNotNullChunk())
-   {
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         // Bail if we run off the end of the preprocessor directive, but return
-         // the token because the caller may need to know where the search ended
-         assert(chunk_is_token(pc, CT_NEWLINE));
-         return(pc);
-      }
-
-      if (chunk_is_token(pc, CT_NL_CONT))
-      {
-         // Skip line continuation
-         pc = pc->GetNext();
-         continue;
-      }
-
-      if ((pc->*checkFn)() == cond)
-      {
-         // Requested token was found
-         return(pc);
-      }
-      pc = pc->GetNext();
-   }
-   // Ran out of tokens
-   return(Chunk::NullChunkPtr);
-}
-
-
-static void chunk_log_msg(Chunk *chunk, const log_sev_t log, const char *str)
-{
-   LOG_FMT(log, "%s orig_line is %zu, orig_col is %zu, ",
-           str, chunk->orig_line, chunk->orig_col);
-
-   if (chunk_is_token(chunk, CT_NEWLINE))
-   {
-      LOG_FMT(log, "<Newline>,\n");
-   }
-   else if (chunk_is_token(chunk, CT_VBRACE_OPEN))
-   {
-      LOG_FMT(log, "<VBRACE_OPEN>,\n");
-   }
-   else if (chunk_is_token(chunk, CT_VBRACE_CLOSE))
-   {
-      LOG_FMT(log, "<VBRACE_CLOSE>,\n");
-   }
-   else
-   {
-      LOG_FMT(log, "Text() is '%s', type is %s,\n", chunk->Text(), get_token_name(chunk->type));
-   }
-}
-
-
-static void chunk_log(Chunk *pc, const char *text)
-{
-   if (  pc != nullptr
-      && pc->IsNotNullChunk()
-      && (cpd.unc_stage != unc_stage_e::TOKENIZE)
-      && (cpd.unc_stage != unc_stage_e::CLEANUP))
-   {
-      const log_sev_t log   = LCHUNK;
-      Chunk           *prev = pc->GetPrev();
-      Chunk           *next = pc->GetNext();
-
-      chunk_log_msg(pc, log, text);
-
-      if (  prev->IsNotNullChunk()
-         && next->IsNotNullChunk())
-      {
-         chunk_log_msg(prev, log, "   @ between");
-         chunk_log_msg(next, log, "   and");
-      }
-      else if (next->IsNotNullChunk())
-      {
-         chunk_log_msg(next, log, "   @ before");
-      }
-      else if (prev->IsNotNullChunk())
-      {
-         chunk_log_msg(prev, log, "   @ after");
-      }
-      LOG_FMT(log, "   stage is %s",                             // Issue #3034
-              get_unc_stage_name(cpd.unc_stage));
-      log_func_stack_inline(log);
-   }
-}
-
-
-Chunk *chunk_add_after(const Chunk *pc_in, Chunk *ref)
-{
-   return(chunk_add(pc_in, ref, E_Direction::FORWARD));
-}
-
-
-Chunk *chunk_add_before(const Chunk *pc_in, Chunk *ref)
-{
-   return(chunk_add(pc_in, ref, E_Direction::BACKWARD));
-}
-
-
-void chunk_del(Chunk * &pc)
-{
-   g_cl.Pop(pc);
-   delete pc;
-   pc = nullptr;
-}
-
-
-void chunk_move_after(Chunk *pc_in, Chunk *ref)
-{
-   LOG_FUNC_ENTRY();
-   g_cl.Pop(pc_in);
-   g_cl.AddAfter(pc_in, ref);
-
-   // HACK: Adjust the original column
-   pc_in->column       = ref->column + space_col_align(ref, pc_in);
-   pc_in->orig_col     = pc_in->column;
-   pc_in->orig_col_end = pc_in->orig_col + pc_in->Len();
-}
-
-
-Chunk *Chunk::GetNextNl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsNewline, scope, E_Direction::FORWARD, true));
-}
-
-
-Chunk *Chunk::GetPrevNl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsNewline, scope, E_Direction::BACKWARD, true));
-}
-
-
-Chunk *Chunk::GetNextNnl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsNewline, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNnl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsNewline, scope, E_Direction::BACKWARD, false));
-}
-
-
-Chunk *Chunk::GetNextNc(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsComment, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNc(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsComment, scope, E_Direction::BACKWARD, false));
-}
-
-
-Chunk *Chunk::GetNextNcNnl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentOrNewline, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNcNnl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentOrNewline, scope, E_Direction::BACKWARD, false));
-}
-
-
-Chunk *Chunk::GetNextNcNnlNpp(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentNewlineOrPreproc, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNcNnlNpp(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentNewlineOrPreproc, scope, E_Direction::BACKWARD, false));
-}
-
-
-Chunk *Chunk::GetNextNppOrNcNnl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentOrNewlineInPreproc, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNppOrNcNnl(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentOrNewlineInPreproc, scope, E_Direction::BACKWARD, false));
-}
-
-
-Chunk *Chunk::PpaGetNextNcNnl() const
-{
-   return(SearchPpa(&Chunk::IsCommentOrNewline, false));
-}
-
-
-Chunk *Chunk::GetNextNcNnlNet(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentNewlineOrEmptyText, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNcNnlNet(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentNewlineOrEmptyText, scope, E_Direction::BACKWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNcNnlNi(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsCommentNewlineOrIgnored, scope, E_Direction::BACKWARD, false));
-}
-
-
-Chunk *Chunk::GetNextNisq(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsSquareBracket, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetNextType(const E_Token cType, const int cLevel, const E_Scope scope) const
-{
-   return(SearchTypeLevel(cType, scope, E_Direction::FORWARD, cLevel));
-}
-
-
-Chunk *Chunk::GetPrevType(const E_Token cType, const int cLevel, const E_Scope scope) const
-{
-   return(SearchTypeLevel(cType, scope, E_Direction::BACKWARD, cLevel));
-}
-
-
-Chunk *Chunk::GetNextString(const char *cStr, const size_t len, const int cLevel, const E_Scope scope) const
-{
-   return(SearchStringLevel(cStr, len, cLevel, scope, E_Direction::FORWARD));
-}
-
-
-Chunk *Chunk::GetPrevString(const char *cStr, const size_t len, const int cLevel, const E_Scope scope) const
-{
-   return(SearchStringLevel(cStr, len, cLevel, scope, E_Direction::BACKWARD));
-}
-
-
-bool chunk_is_newline_between(Chunk *start, Chunk *end)
-{
-   for (Chunk *pc = start; pc != nullptr && pc != end; pc = pc->GetNext())
-   {
-      if (chunk_is_newline(pc))
-      {
-         return(true);
-      }
-   }
-
-   return(false);
-}
-
-
-void chunk_swap(Chunk *pc1, Chunk *pc2)
-{
-   g_cl.Swap(pc1, pc2);
-}
-
-
-// TODO: the following function shall be made similar to the search functions
-Chunk *chunk_first_on_line(Chunk *pc)
-{
-   if (  pc == nullptr
-      || pc->IsNullChunk())
-   {
-      return(Chunk::NullChunkPtr);
-   }
-   Chunk *first = pc;
-
-   while (  (pc = pc->GetPrev())->IsNotNullChunk()
-         && !chunk_is_newline(pc))
-   {
-      first = pc;
-   }
-   return(first);
-}
-
-
-bool chunk_is_last_on_line(Chunk *pc)  //TODO: pc should be const here
-{
-   // check if pc is the very last chunk of the file
-   const Chunk *end = Chunk::GetTail();
-
-   if (pc == end)
-   {
-      return(true);
-   }
-   // if the next chunk is a newline then pc is the last chunk on its line
-   const Chunk *next = pc->GetNext();
-
-   if (chunk_is_token(next, CT_NEWLINE))
-   {
-      return(true);
-   }
-   return(false);
-}
-
-
-// TODO: this function needs some cleanup
-void chunk_swap_lines(Chunk *pc1, Chunk *pc2)
-{
-   // to swap lines we need to find the first chunk of the lines
-   pc1 = chunk_first_on_line(pc1);
-   pc2 = chunk_first_on_line(pc2);
-
-   if (  pc1->IsNullChunk()
-      || pc2->IsNullChunk()
-      || pc1 == pc2)
-   {
-      return;
-   }
-   /*
-    * Example start:
-    * ? - start1 - a1 - b1 - nl1 - ? - ref2 - start2 - a2 - b2 - nl2 - ?
-    *      ^- pc1                              ^- pc2
-    */
-   Chunk *ref2 = pc2->GetPrev();
-
-   // Move the line started at pc2 before pc1
-   while (  pc2->IsNotNullChunk()
-         && !chunk_is_newline(pc2))
-   {
-      Chunk *tmp = pc2->GetNext();
-      g_cl.Pop(pc2);
-      g_cl.AddBefore(pc2, pc1);
-      pc2 = tmp;
-   }
-   /*
-    * Should now be:
-    * ? - start2 - a2 - b2 - start1 - a1 - b1 - nl1 - ? - ref2 - nl2 - ?
-    *                         ^- pc1                              ^- pc2
-    */
-
-   // Now move the line started at pc1 after ref2
-   while (  pc1->IsNotNullChunk()
-         && !chunk_is_newline(pc1))
-   {
-      Chunk *tmp = pc1->GetNext();
-      g_cl.Pop(pc1);
-
-      if (ref2->IsNotNullChunk())
-      {
-         g_cl.AddAfter(pc1, ref2);
-      }
-      else
-      {
-         g_cl.AddHead(pc1);
-      }
-      ref2 = pc1;
-      pc1  = tmp;
-   }
-   /*
-    * Should now be:
-    * ? - start2 - a2 - b2 - nl1 - ? - ref2 - start1 - a1 - b1 - nl2 - ?
-    *                         ^- pc1                              ^- pc2
-    */
-
-   /*
-    * pc1 and pc2 should be the newlines for their lines.
-    * swap the chunks and the nl_count so that the spacing remains the same.
-    */
-   if (  pc1->IsNotNullChunk()
-      && pc2->IsNotNullChunk())
-   {
-      size_t nl_count = pc1->nl_count;
-
-      pc1->nl_count = pc2->nl_count;
-      pc2->nl_count = nl_count;
-
-      chunk_swap(pc1, pc2);
-   }
-} // chunk_swap_lines
-
-
-Chunk *Chunk::GetNextNvb(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsVBrace, scope, E_Direction::FORWARD, false));
-}
-
-
-Chunk *Chunk::GetPrevNvb(const E_Scope scope) const
-{
-   return(Search(&Chunk::IsVBrace, scope, E_Direction::BACKWARD, false));
-}
-
-
-void chunk_flags_set_real(Chunk *pc, pcf_flags_t clr_bits, pcf_flags_t set_bits)
-{
-   if (  pc != nullptr
-      && pc->IsNotNullChunk())
-   {
-      LOG_FUNC_ENTRY();
-      auto const nflags = (pc->flags & ~clr_bits) | set_bits;
-
-      if (pc->flags != nflags)
-      {
-         LOG_FMT(LSETFLG,
-                 "%s(%d): %016llx^%016llx=%016llx\n"
-                 "   orig_line is %zu, orig_col is %zu, Text() '%s', type is %s,",
-                 __func__, __LINE__,
-                 static_cast<pcf_flags_t::int_t>(pc->flags),
-                 static_cast<pcf_flags_t::int_t>(pc->flags ^ nflags),
-                 static_cast<pcf_flags_t::int_t>(nflags),
-                 pc->orig_line, pc->orig_col, pc->Text(),
-                 get_token_name(pc->type));
-         LOG_FMT(LSETFLG, " parent_type is %s,\n  ",
-                 get_token_name(get_chunk_parent_type(pc)));
-         log_func_stack_inline(LSETFLG);
-         pc->flags = nflags;
-      }
-   }
-}
-
-
-void set_chunk_type_real(Chunk *pc, E_Token token, const char *func, int line)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc == nullptr
-      || pc->IsNullChunk()
-      || pc->type == token)
-   {
-      return;
-   }
-   LOG_FMT(LSETTYP, "%s(%d): orig_line is %zu, orig_col is %zu, pc->Text() ",
-           func, line, pc->orig_line, pc->orig_col);
-
-   if (token == CT_NEWLINE)
-   {
-      LOG_FMT(LSETTYP, "<Newline>\n");
-   }
-   else
-   {
-      LOG_FMT(LSETTYP, "'%s'\n", pc->Text());
-   }
-   LOG_FMT(LSETTYP, "   pc->type is %s, pc->parent_type is %s => *type is %s, *parent_type is %s\n",
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           get_token_name(token), get_token_name(get_chunk_parent_type(pc)));
-   pc->type = token;
-} // set_chunk_type_real
-
-
-void set_chunk_parent_real(Chunk *pc, E_Token token, const char *func, int line)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc == nullptr
-      || pc->IsNullChunk()
-      || get_chunk_parent_type(pc) == token)
-   {
-      return;
-   }
-   LOG_FMT(LSETPAR, "%s(%d): orig_line is %zu, orig_col is %zu, pc->Text() ",
-           func, line, pc->orig_line, pc->orig_col);
-
-   if (token == CT_NEWLINE)
-   {
-      LOG_FMT(LSETPAR, "<Newline>\n");
-   }
-   else
-   {
-      char copy[1000];
-      LOG_FMT(LSETPAR, "'%s'\n", pc->ElidedText(copy));
-   }
-   LOG_FMT(LSETPAR, "   pc->type is %s, pc->parent_type is %s => *type is %s, *parent_type is %s\n",
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           get_token_name(token), get_token_name(get_chunk_parent_type(pc)));
-   pc->parent_type = token;
-} // set_chunk_parent_real
-
-
-E_Token get_chunk_parent_type(Chunk *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return(CT_NONE);
-   }
-   return(pc->parent_type);
-} // get_chunk_parent_type
-
-
-static Chunk *chunk_add(const Chunk *pc_in, Chunk *ref, const E_Direction pos)
-{
-#ifdef DEBUG
-   // test if the pc_in chunk is properly set
-   if (pc_in->pp_level == 999)
-   {
-      fprintf(stderr, "%s(%d): pp_level is not set\n", __func__, __LINE__);
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-
-   if (pc_in->orig_line == 0)
-   {
-      fprintf(stderr, "%s(%d): no line number\n", __func__, __LINE__);
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-
-   if (pc_in->orig_col == 0)
-   {
-      fprintf(stderr, "%s(%d): no column number\n", __func__, __LINE__);
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-#endif /* DEBUG */
-
-   Chunk *pc = new Chunk(*pc_in);
-
-   if (pc != nullptr)
-   {
-      if (ref != nullptr) // ref is a valid chunk
-      {
-         (pos == E_Direction::FORWARD) ? g_cl.AddAfter(pc, ref) : g_cl.AddBefore(pc, ref);
-      }
-      else // ref == NULL
-      {
-         (pos == E_Direction::FORWARD) ? g_cl.AddHead(pc) : g_cl.AddTail(pc);
-      }
-      chunk_log(pc, "chunk_add(A):");
-   }
-   return(pc);
-} // chunk_add
-
-
-Chunk *chunk_get_next_ssq(Chunk *cur)
-{
-   while (  chunk_is_token(cur, CT_TSQUARE)
-         || chunk_is_token(cur, CT_SQUARE_OPEN))
-   {
-      if (chunk_is_token(cur, CT_SQUARE_OPEN))
-      {
-         cur = chunk_skip_to_match(cur);
-      }
-      cur = cur->GetNextNcNnl();
-   }
-   return(cur);
-}
-
-
-Chunk *chunk_get_prev_ssq(Chunk *cur)
-{
-   while (  chunk_is_token(cur, CT_TSQUARE)
-         || chunk_is_token(cur, CT_SQUARE_CLOSE))
-   {
-      if (chunk_is_token(cur, CT_SQUARE_CLOSE))
-      {
-         cur = chunk_skip_to_match_rev(cur);
-      }
-      cur = cur->GetPrevNcNnl();
-   }
-   return(cur);
-}
-
-
-Chunk *chunk_get_pp_start(Chunk *cur)
-{
-   if (!cur->IsPreproc())
-   {
-      return(nullptr);
-   }
-
-   while (!chunk_is_token(cur, CT_PREPROC))
-   {
-      cur = cur->GetPrev(E_Scope::PREPROC);
-   }
-   return(cur);
-}
-
-
-//! skip to the final word/type in a :: chain
-static Chunk *chunk_skip_dc_member(Chunk *start, E_Scope scope, E_Direction dir)
-{
-   LOG_FUNC_ENTRY();
-
-   if (start == nullptr)
-   {
-      return(nullptr);
-   }
-   const auto step_fcn = (dir == E_Direction::FORWARD)
-                         ? &Chunk::GetNextNcNnl : &Chunk::GetPrevNcNnl;
-
-   Chunk *pc   = start;
-   Chunk *next = chunk_is_token(pc, CT_DC_MEMBER) ? pc : (pc->*step_fcn)(scope);
-
-   while (chunk_is_token(next, CT_DC_MEMBER))
-   {
-      pc = (next->*step_fcn)(scope);
-
-      if (pc->IsNullChunk())
-      {
-         return(Chunk::NullChunkPtr);
-      }
-      next = (pc->*step_fcn)(scope);
-   }
-   return(pc);
-}
-
-
-Chunk *chunk_skip_dc_member(Chunk *start, E_Scope scope)
-{
-   return(chunk_skip_dc_member(start, scope, E_Direction::FORWARD));
-}
-
-
-Chunk *chunk_skip_dc_member_rev(Chunk *start, E_Scope scope)
-{
-   return(chunk_skip_dc_member(start, scope, E_Direction::BACKWARD));
-}
-
-
-// set parent member
-void chunk_set_parent(Chunk *pc, Chunk *parent)
-{
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   if (parent == nullptr)
-   {
-      return;
-   }
-
-   if (pc == parent)
-   {
-      return;
-   }
-   pc->parent = parent;
-}
-
-
-E_Token get_type_of_the_parent(Chunk *pc)
-{
-   if (pc == nullptr)
-   {
-      return(CT_UNKNOWN);
-   }
-
-   if (pc->parent == nullptr)
-   {
-      return(CT_PARENT_NOT_SET);
-   }
-   return(pc->parent->type);
-}
-
-
-bool chunk_is_attribute_or_declspec(Chunk *pc)
-{
-   return(  language_is_set(LANG_CPP)
-         && (  chunk_is_token(pc, CT_ATTRIBUTE)
-            || chunk_is_token(pc, CT_DECLSPEC)));
-}
-
-
-bool chunk_is_class_enum_struct_union(Chunk *pc)
-{
-   return(  chunk_is_class_or_struct(pc)
-         || chunk_is_enum(pc)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-bool chunk_is_class_or_struct(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_CLASS)
-         || chunk_is_token(pc, CT_STRUCT));
-}
-
-
-bool chunk_is_class_struct_union(Chunk *pc)
-{
-   return(  chunk_is_class_or_struct(pc)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-bool chunk_is_enum(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_ENUM)
-         || chunk_is_token(pc, CT_ENUM_CLASS));
-}
-
-
-int chunk_compare_position(const Chunk *A_token, const Chunk *B_token)
-{
-   if (A_token == nullptr)
-   {
-      assert(A_token);
-   }
-
-   if (B_token == nullptr)
-   {
-      assert(B_token);
-   }
-
-   if (A_token->orig_line < B_token->orig_line)
-   {
-      return(-1);
-   }
-   else if (A_token->orig_line == B_token->orig_line)
-   {
-      if (A_token->orig_col < B_token->orig_col)
-      {
-         return(-1);
-      }
-      else if (A_token->orig_col == B_token->orig_col)
-      {
-         return(0);
-      }
-   }
-   return(1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.h
deleted file mode 100644
index cf3b987f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.h
+++ /dev/null
@@ -1,1262 +0,0 @@
-/**
- * @file chunk.h
- * Manages and navigates the list of chunks.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef CHUNK_LIST_H_INCLUDED
-#define CHUNK_LIST_H_INCLUDED
-
-#include "uncrustify_types.h"
-// necessary to not sort it
-#include "char_table.h"
-#include "language_tools.h"
-
-
-/*
- * TODO: better use a namespace for all chunk related operations.
- * The function "chunk_is_comment()" would for instance
- * become "chunk::is_comment()". This makes the usage of the chunks easier
- * and more intuitive.
- */
-
-
-static constexpr int ANY_LEVEL = -1;
-
-
-/**
- * Specifies which chunks should/should not be found.
- * ALL (default)
- *  - return the true next/prev
- *
- * PREPROC
- *  - If not in a preprocessor, skip over any encountered preprocessor stuff
- *  - If in a preprocessor, fail to leave (return nullptr)
- */
-enum class E_Scope : unsigned int
-{
-   ALL,      //! search in all kind of chunks
-   PREPROC,  //! search only in preprocessor chunks
-};
-
-
-/**
- * Specifies which direction or location an operation shall be performed.
- */
-enum class E_Direction : unsigned int
-{
-   FORWARD,
-   BACKWARD
-};
-
-
-/**
- * Temporary internal typedef. Will be progressively be replaced by Chunk::CheckFnPtr.
- *
- * @brief prototype for a function that checks a chunk to have a given type
- *
- * @note this typedef defines the function type "check_t"
- * for a function pointer of type
- * bool function(Chunk *pc)
- */
-// TODO remove when finished
-typedef bool (*check_t)(Chunk *pc);
-
-
-// This is the main type of this program
-class Chunk
-{
-public:
-   static Chunk        NullChunk;                       // Null Chunk
-   static Chunk *const NullChunkPtr;                    // Pointer to the Null Chunk
-
-   //! constructors
-   Chunk(bool null_c = false);                    // default
-   Chunk(const Chunk &o);                         // !!! partial copy: chunk is not linked to others
-
-   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); }
-
-   //! sets all elements of the struct to their default value
-   void Reset();
-
-   //! provides the number of characters of string
-   size_t Len() const;
-
-   //! provides the content of a string a zero terminated character pointer
-   const char *Text() const;
-
-   // Issue #2984, fill up, if necessary, a copy of the first chars of the Text() string
-   const char *ElidedText(char *for_the_copy) const;
-
-
-   // --------- Get* chunk functions
-
-   /**
-    * @brief returns the head of the chunk list
-    * @return pointer to the first chunk
-    */
-   static Chunk *GetHead(void);
-
-   /**
-    * @brief returns the tail of the chunk list
-    * @return pointer to the last chunk
-    */
-   static Chunk *GetTail(void);
-
-   /**
-    * @brief returns the next chunk in a list of chunks
-    * @param scope code region to search in
-    * @return pointer to next chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNext(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the previous chunk in a list of chunks
-    * @param scope code region to search in
-    * @return pointer to previous chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrev(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the next newline chunk
-    * @param scope code region to search in
-    * @return pointer to next newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the prev newline chunk
-    * @param scope code region to search in
-    * @return pointer to prev newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the next non-newline chunk
-    * @param scope code region to search in
-    * @return pointer to next non-newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNnl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the prev non-newline chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNnl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the next non-comment chunk
-    * @param scope code region to search in
-    * @return pointer to next non-comment chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNc(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the prev non-comment chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-comment chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNc(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the next non-comment and non-newline chunk
-    * @param scope code region to search in
-    * @return pointer to next non-comment and non-newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNcNnl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the prev non-comment and non-newline chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-comment and non-newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNcNnl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the next non-comment, non-newline, non-preprocessor chunk
-    * @param scope code region to search in
-    * @return pointer to next non-comment, non-newline, non-preprocessor chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNcNnlNpp(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the prev non-comment, non-newline, non-preprocessor chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-comment, non-newline, non-preprocessor chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNcNnlNpp(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the next non-preprocessor or non-comment, non-newline chunk
-    * @param scope code region to search in
-    * @return pointer to next non-preprocessor or non-comment, non-newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNppOrNcNnl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the prev non-preprocessor or non-comment, non-newline chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-preprocessor or non-comment, non-newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNppOrNcNnl(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the next preprocessor aware non-comment and non-newline chunk
-    *        Unlike Chunk::GetNextNcNnl, this will also ignore a line continuation if
-    *        the starting chunk is in a preprocessor directive, and may return a newline
-    *        if the search reaches the end of a preprocessor directive.
-    * @return pointer to next preprocessor aware non-comment and non-newline chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *PpaGetNextNcNnl() const;
-
-   /**
-    * @brief returns the next non-comment, non-newline, non-empty text chunk
-    * @param scope code region to search in
-    * @return pointer to next non-comment, non-newline, non-empty text chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNcNnlNet(const E_Scope scope = E_Scope::ALL) const;
-
-   /**
-    * @brief returns the prev non-comment, non-newline, non-empty text chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-comment, non-newline, non-empty text chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNcNnlNet(const E_Scope scope = E_Scope::ALL) const;
-
-
-   /**
-    * @brief returns the prev non-comment, non-newline, non-ignored chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-comment, non-newline, non-ignored chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNcNnlNi(const E_Scope scope = E_Scope::ALL) const;
-
-
-   /**
-    * @brief returns the next chunk not in or part of balanced square
-    *        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
-    */
-   Chunk *GetNextNisq(const E_Scope scope = E_Scope::ALL) const;
-
-
-   /**
-    * @brief returns the next non-virtual brace chunk
-    * @param scope code region to search in
-    * @return pointer to next non-virtual brace chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetNextNvb(const E_Scope scope = E_Scope::ALL) const;
-
-
-   /**
-    * @brief returns the prev non-virtual brace chunk
-    * @param scope code region to search in
-    * @return pointer to prev non-virtual brace chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *GetPrevNvb(const E_Scope scope = E_Scope::ALL) const;
-
-
-   /**
-    * @brief returns the next chunk of the given type at the level.
-    * @param cType  the type to look for
-    * @param cLevel the level to match, -1 or ANY_LEVEL (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 *GetNextType(const E_Token cType, const int cLevel, const E_Scope scope = E_Scope::ALL) const;
-
-
-   /**
-    * @brief returns the prev chunk of the given type at the level.
-    * @param cType  the type to look for
-    * @param cLevel the level to match, -1 or ANY_LEVEL (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 *GetPrevType(const E_Token type, int level, E_Scope scope = E_Scope::ALL) const;
-
-
-   /**
-    * @brief returns the next chunk that holds a given string at a given level.
-    * @param cStr   string to search for
-    * @param len    length of string
-    * @param cLevel -1 or ANY_LEVEL (any level) or the level to match
-    * @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 cLevel, 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 len    length of string
-    * @param cLevel -1 or ANY_LEVEL (any level) or the level to match
-    * @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 cLevel, const E_Scope scope = E_Scope::ALL) const;
-
-
-   // --------- Search functions
-
-   /**
-    * @brief defines a member function pointer for a function of type
-    * Chunk *Chunk::function(const E_Scope scope)
-    * that will search for a new chunk
-    */
-   typedef Chunk *(Chunk::*T_SearchFnPtr)(const E_Scope scope) const;
-
-   /**
-    * @brief defines a member function pointer for a function of type
-    * bool Chunk::function() const;
-    * that checks whether a chunk satisty a specific condition
-    */
-   typedef bool (Chunk::*T_CheckFnPtr)() const;
-
-   /**
-    * @brief determines the search direction to use and returns a pointer
-    *        to the corresponding search function.
-    * @param dir search direction
-    * @return pointer to search function
-    */
-   static T_SearchFnPtr GetSearchFn(const E_Direction dir = E_Direction::FORWARD);
-
-   /**
-    * @brief search for a chunk that satisfies a condition in a chunk list
-    *
-    * A generic function that traverses a chunks list either
-    * in forward or reverse direction. The traversal continues until a
-    * chunk satisfies the condition defined by the compare function.
-    * Depending on the parameter cond the condition will either be
-    * checked to be true or false.
-    *
-    * @param  checkFn  compare function
-    * @param  scope    code parts to consider for search
-    * @param  dir      search direction (forward or backward)
-    * @param  cond     success condition
-    *
-    * @return pointer to the found chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *Search(const T_CheckFnPtr checkFn, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD, const bool cond = true) const;
-
-   /**
-    * @brief search for a chunk that satisfies a condition in a chunk list,
-    *        but being aware of preprocessor chucks.
-    *
-    * This function is similar to Search, except that it is tweaked to
-    * handle searches inside of preprocessor directives. Specifically, if the
-    * starting token is inside a preprocessor directive, it will ignore a line
-    * continuation, and will abort the search if it reaches the end of the
-    * directive. This function only searches forward.
-    *
-    * @param  checkFn  compare function
-    * @param  cond     success condition
-    *
-    * @return pointer to the found chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *SearchPpa(const T_CheckFnPtr checkFn, const bool cond = true) const;
-
-   /**
-    * @brief search a chunk of a given type and level. Traverses a chunk list in the
-    * specified direction until a chunk of a given type is found.
-    *
-    * This function is a specialization of Chunk::Search.
-    *
-    * @param cType  category to search for
-    * @param scope  code parts to consider for search
-    * @param dir    search direction
-    * @param cLevel nesting level to match or -1 / ANY_LEVEL
-    *
-    * @return pointer to the found chunk or Chunk::NullChunkPtr if no chunk was found
-    */
-   Chunk *SearchTypeLevel(const E_Token cType, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD, const int cLevel = -1) const;
-
-
-   /**
-    * @brief searches a chunk that holds a specific string
-    *
-    * Traverses a chunk list either in forward or backward direction until a chunk
-    * 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  len    length of the string
-    * @param  cLevel 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 cLevel, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD) const;
-
-
-   // --------- Is* functions
-
-   /**
-    * @brief checks whether the chunk is a specific token
-    * @token the token to check for
-    * @return true if the chunk type matches the specified token, false otherwise
-    */
-   bool Is(E_Token token) const;
-
-   /**
-    * @brief checks whether the chunk is not a specific token
-    * @token the token to check for
-    * @return true if the chunk type does not matches the specified token, false otherwise
-    */
-   bool IsNot(E_Token token) const;
-
-   /**
-    * @brief checks whether the chunk is a newline
-    * @return true if the chunk is a newline, false otherwise
-    */
-   bool IsNewline() const;
-
-   /**
-    * @brief checks whether the chunk is a comment
-    * This means any kind of:
-    *   - single line comment
-    *   - multiline comment
-    *   - C comment
-    *   - C++ comment
-    */
-   bool IsComment() const;
-
-   /**
-    * @brief checks whether the chunk is valid and has an empty text
-    * @return true if the chunk is valid and has an empty text
-    */
-   bool IsEmptyText() const;
-
-   /**
-    * @brief checks whether the chunk is a preprocessor
-    * @return true if the chunk is a preprocessor, false otherwise
-    */
-   bool IsPreproc() const;
-
-   /**
-    * @brief checks whether the chunk is either a comment or a newline
-    * @return true if the chunk is either a comment or a newline, false otherwise
-    */
-   bool IsCommentOrNewline() const;
-
-   /**
-    * @brief checks whether the chunk is either a comment, a newline or ignored
-    * @return true if the chunk is either a comment, a newline or ignored, false otherwise
-    */
-   bool IsCommentNewlineOrIgnored() const;
-
-   /**
-    * @brief checks whether the chunk is a comment, a newline or a preprocessor
-    * @return true if the chunk is a comment, a newline or a preprocessor, false otherwise
-    */
-   bool IsCommentNewlineOrPreproc() const;
-
-   /**
-    * @brief checks whether the chunk is a preprocessor and either a comment or a newline
-    * @return true if the chunk is a preprocessor and either a comment or a newline, false otherwise
-    */
-   bool IsCommentOrNewlineInPreproc() const;
-
-   /**
-    * @brief checks whether the chunk is a comment, a newline or has an empty text
-    * @return true if the chunk is a comment, a newline or has an empty text
-    */
-   bool IsCommentNewlineOrEmptyText() const;
-
-   /**
-    * @brief checks whether the chunk is a square bracket
-    * @return true if the chunk is a square bracket
-    */
-   bool IsSquareBracket() const;
-
-   /**
-    * @brief checks whether the chunk is a virtual brace
-    * @return true if the chunk is a virtual brace
-    */
-   bool IsVBrace() const;
-
-   /**
-    * @brief checks whether the chunk matches a given type and level
-    * @param type  category to search for
-    * @param level nesting level to match
-    * @return true if the chunk matches a given type and level
-    */
-   bool IsTypeAndLevel(const E_Token cType, const int cLevel) const;
-
-
-   /**
-    * @brief checks whether the chunk matches a given string and level
-    * @param cStr   the expected string
-    * @param len    length of the string
-    * @param cLevel 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, const int cLevel) const;
-
-
-   /**
-    * @brief checks whether the chunk is a star/asterisk
-    * @return true if the chunk is a star/asterisk
-    */
-   bool IsStar() const;
-
-
-   // --------- Data members
-
-   Chunk        *next;                       //! pointer to next chunk in list
-   Chunk        *prev;                       //! pointer to previous chunk in list
-   Chunk        *parent;                     //! pointer to parent chunk(not always set)
-
-   align_ptr_t  align;
-   indent_ptr_t indent;
-   E_Token      type;                        //! type of the chunk itself
-   E_Token      parent_type;                 //! type of the parent chunk usually CT_NONE
-   //! might be different from parent->parent_type (above)
-   size_t       orig_line;                   //! line number of chunk in input file
-   size_t       orig_col;                    //! column where chunk started in the input file, is always > 0
-   size_t       orig_col_end;                //! column where chunk ended in the input file, is always > 1
-   UINT32       orig_prev_sp;                //! whitespace before this token
-   pcf_flags_t  flags;                       //! see PCF_xxx
-   size_t       column;                      //! column of chunk
-   size_t       column_indent;               /** if 1st on a line, set to the 'indent'
-                                              * column, which may be less than the real
-                                              * column used to indent with tabs          */
-   size_t   nl_count;                        //! number of newlines in CT_NEWLINE
-   size_t   nl_column;                       //! column of the subsequent newline entries(all of them should have the same column)
-   size_t   level;                           /** nest level in {, (, or [
-                                              * only to help vim command } */
-   size_t   brace_level;                     //! nest level in braces only
-   size_t   pp_level;                        //! nest level in preprocessor
-   bool     after_tab;                       //! whether this token was after a tab
-   unc_text str;                             //! the token text
-
-   // for debugging purpose only
-   track_list *tracking;
-
-private:
-   void copyFrom(const Chunk &o);              // !!! partial copy: chunk is not linked to others
-
-   const bool null_chunk;                      //! true for null chunks
-};
-
-
-/**
- * @brief Add a copy of a chunk to a chunk list after the given position.
- *
- * @note If ref is nullptr, add at the tail of the chunk list
- *
- * @todo is ref=nullptr really useful ?
- *
- * @param pc_in  pointer to chunk to add to list
- * @param ref    position where insertion takes place
- *
- * @return pointer to the added chunk
- */
-Chunk *chunk_add_after(const Chunk *pc_in, Chunk *ref);
-
-
-/**
- * @brief Add a copy of a chunk to a chunk list before the given position
- *
- * @note If ref is nullptr, add at the head of the chunk list
- *
- * @todo is ref=nullptr really useful ?
- *
- * \bug code adds it before the tail, either code or comment is wrong
- *
- * @param pc_in  pointer to chunk to add to list
- * @param ref    position where insertion takes place
- *
- * @retval pointer to the added chunk
- */
-Chunk *chunk_add_before(const Chunk *pc_in, Chunk *ref);
-
-
-/**
- * delete a chunk from a chunk list
- *
- * @param pc  chunk to delete
- */
-void chunk_del(Chunk * &pc);
-
-
-/**
- * move a chunk to after the reference position in a chunk list
- *
- * @param pc_in  chunk to move
- * @param ref    chunk after which to move
- */
-void chunk_move_after(Chunk *pc_in, Chunk *ref);
-
-
-/**
- * Swaps two chunks
- *
- * @param pc1  The first chunk
- * @param pc2  The second chunk
- */
-void chunk_swap(Chunk *pc1, Chunk *pc2);
-
-
-/**
- * Swaps two lines that are started with the specified chunks.
- *
- * @param pc1  The first chunk of line 1
- * @param pc2  The first chunk of line 2
- */
-void chunk_swap_lines(Chunk *pc1, Chunk *pc2);
-
-
-/**
- * Finds the first chunk on the line that pc is on.
- * This just backs up until a newline or nullptr is hit.
- *
- * given: [ a - b - c - n1 - d - e - n2 ]
- * input: [ a | b | c | n1 ] => a
- * input: [ d | e | n2 ]     => d
- *
- * @param pc  chunk to start with
- */
-Chunk *chunk_first_on_line(Chunk *pc);
-
-
-//! check if a given chunk is the last on its line
-bool chunk_is_last_on_line(Chunk *pc);
-
-
-/**
- * Gets the next chunk not in or part of balanced square
- * brackets.This handles stacked[] instances to accommodate
- * multi - dimensional array declarations
- *
- * @param  cur    chunk to use as start point
- *
- * @return nullptr or the next chunk not in or part of square brackets
- */
-Chunk *chunk_get_next_ssq(Chunk *cur);
-
-/**
- * Gets the prev chunk not in or part of balanced square
- * brackets.This handles stacked[] instances to accommodate
- * multi - dimensional array declarations
- *
- * @param  cur    chunk to use as start point
- *
- * @return nullptr or the prev chunk not in or part of square brackets
- */
-Chunk *chunk_get_prev_ssq(Chunk *cur);
-
-
-/**
- * Gets the corresponding start chunk if the given chunk is within a
- * preprocessor directive, or nullptr otherwise.
- *
- * @param  cur    chunk to use as start point
- *
- * @return nullptr or start chunk of the preprocessor directive
- */
-Chunk *chunk_get_pp_start(Chunk *cur);
-
-
-/**
- * @brief reverse search a chunk of a given category in a chunk list
- *
- * @param  pc   chunk list to search in
- * @param  cat  category to search for
- *
- * @retval nullptr  no object found, or invalid parameters provided
- * @retval Chunk  pointer to the found object
- */
-Chunk *chunk_search_prev_cat(Chunk *pc, const E_Token cat);
-
-
-/**
- * @brief forward search a chunk of a given category in a chunk list
- *
- * @param  pc   chunk list to search in
- * @param  cat  category to search for
- *
- * @retval nullptr  no object found, or invalid parameters provided
- * @retval Chunk  pointer to the found object
- */
-Chunk *chunk_search_next_cat(Chunk *pc, const E_Token cat);
-
-
-/**
- * @brief checks wether two chunks are in same line
- *
- * @param  start
- * @param  end
- *
- * @return true if there is no newline between start and end chunks
- */
-bool are_chunks_in_same_line(Chunk *start, Chunk *end);
-
-
-inline bool Chunk::IsTypeAndLevel(const E_Token cType, const int cLevel) const
-{
-   return(  (  cLevel < 0
-            || level == static_cast<size_t>(cLevel))
-         && type == cType);
-}
-
-
-inline bool Chunk::IsStringAndLevel(const char *cStr, const size_t len, const int cLevel) const
-{
-   return(  (  cLevel < 0
-            || level == static_cast<size_t>(cLevel))
-         && Len() == len                       // the length is as expected
-         && memcmp(cStr, Text(), len) == 0);   // the strings are equal
-}
-
-
-inline bool Chunk::Is(E_Token token) const
-{
-   return(  IsNotNullChunk()
-         && type == token);
-}
-
-
-inline bool Chunk::IsNot(E_Token token) const
-{
-   return(!Is(token));
-}
-
-
-inline bool Chunk::IsNewline() const
-{
-   return(  Is(CT_NEWLINE)
-         || Is(CT_NL_CONT));
-}
-
-
-inline bool Chunk::IsComment() const
-{
-   return(  Is(CT_COMMENT)
-         || Is(CT_COMMENT_MULTI)
-         || Is(CT_COMMENT_CPP));
-}
-
-
-inline bool Chunk::IsEmptyText() const
-{
-   return(  IsNotNullChunk()
-         && Len() == 0);
-}
-
-
-inline bool Chunk::IsPreproc() const
-{
-   return(  IsNotNullChunk()
-         && flags.test(PCF_IN_PREPROC));
-}
-
-
-inline bool Chunk::IsCommentOrNewline() const
-{
-   return(  IsComment()
-         || IsNewline());
-}
-
-
-inline bool Chunk::IsCommentNewlineOrPreproc() const
-{
-   return(  IsComment()
-         || IsNewline()
-         || IsPreproc());
-}
-
-
-inline bool Chunk::IsCommentOrNewlineInPreproc() const
-{
-   return(  IsPreproc()
-         && (  IsComment()
-            || IsNewline()));
-}
-
-
-inline bool Chunk::IsCommentNewlineOrEmptyText() const
-{
-   return(  IsComment()
-         || IsNewline()
-         || IsEmptyText());
-}
-
-
-inline bool Chunk::IsCommentNewlineOrIgnored() const
-{
-   return(  IsComment()
-         || IsNewline()
-         || Is(CT_IGNORED));
-}
-
-
-inline bool Chunk::IsSquareBracket() const
-{
-   return(  Is(CT_SQUARE_OPEN)
-         || Is(CT_TSQUARE)
-         || Is(CT_SQUARE_CLOSE));
-}
-
-
-inline bool Chunk::IsVBrace() const
-{
-   return(  Is(CT_VBRACE_OPEN)
-         || Is(CT_VBRACE_CLOSE));
-}
-
-
-inline bool Chunk::IsStar() const
-{
-   return(  Len() == 1
-         && str[0] == '*'
-         && IsNot(CT_OPERATOR_VAL));
-}
-
-
-// TODO remove when possible
-static inline bool chunk_is_token(const Chunk *pc, E_Token c_token)
-{
-   return(  pc != nullptr
-         && pc->IsNotNullChunk()
-         && pc->type == c_token);
-}
-
-
-// TODO remove when possible
-static inline bool chunk_is_not_token(const Chunk *pc, E_Token c_token)
-{
-   return(  pc != nullptr
-         && pc->IsNotNullChunk()
-         && pc->type != c_token);
-}
-
-
-/**
- * Skips to the closing match for the current paren/brace/square.
- *
- * @param  cur    The opening or closing paren/brace/square
- * @param  scope  chunk section to consider
- *
- * @return nullptr or the matching paren/brace/square
- */
-static inline Chunk *chunk_skip_to_match(Chunk *cur, E_Scope scope = E_Scope::ALL)
-{
-   if (  cur != nullptr
-      && (  chunk_is_token(cur, CT_PAREN_OPEN)
-         || chunk_is_token(cur, CT_SPAREN_OPEN)
-         || chunk_is_token(cur, CT_FPAREN_OPEN)
-         || chunk_is_token(cur, CT_TPAREN_OPEN)
-         || chunk_is_token(cur, CT_BRACE_OPEN)
-         || chunk_is_token(cur, CT_VBRACE_OPEN)
-         || chunk_is_token(cur, CT_ANGLE_OPEN)
-         || chunk_is_token(cur, CT_SQUARE_OPEN)))
-   {
-      return(cur->GetNextType((E_Token)(cur->type + 1), cur->level, scope));
-   }
-   return(cur);
-}
-
-
-static inline Chunk *chunk_skip_to_match_rev(Chunk *cur, E_Scope scope = E_Scope::ALL)
-{
-   if (  cur != nullptr
-      && (  chunk_is_token(cur, CT_PAREN_CLOSE)
-         || chunk_is_token(cur, CT_SPAREN_CLOSE)
-         || chunk_is_token(cur, CT_FPAREN_CLOSE)
-         || chunk_is_token(cur, CT_TPAREN_CLOSE)
-         || chunk_is_token(cur, CT_BRACE_CLOSE)
-         || chunk_is_token(cur, CT_VBRACE_CLOSE)
-         || chunk_is_token(cur, CT_ANGLE_CLOSE)
-         || chunk_is_token(cur, CT_SQUARE_CLOSE)))
-   {
-      return(cur->GetPrevType((E_Token)(cur->type - 1), cur->level, scope));
-   }
-   return(cur);
-}
-
-
-//! skip to the final word/type in a :: chain
-Chunk *chunk_skip_dc_member(Chunk *start, E_Scope scope = E_Scope::ALL);
-Chunk *chunk_skip_dc_member_rev(Chunk *start, E_Scope scope = E_Scope::ALL);
-
-
-/**
- * Returns true if the chunk under test is an inheritance access specifier
- */
-static inline bool chunk_is_cpp_inheritance_access_specifier(Chunk *pc)
-{
-   return(  language_is_set(LANG_CPP)
-         && pc != nullptr
-         && pc->IsNotNullChunk()
-         && (  chunk_is_token(pc, CT_ACCESS)
-            || chunk_is_token(pc, CT_QUALIFIER))
-         && (  std::strncmp(pc->str.c_str(), "private", 7) == 0
-            || std::strncmp(pc->str.c_str(), "protected", 9) == 0
-            || std::strncmp(pc->str.c_str(), "public", 6) == 0));
-} // chunk_is_cpp_inheritance_access_specifier
-
-
-static inline bool chunk_is_colon(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_ACCESS_COLON)
-         || chunk_is_token(pc, CT_ASM_COLON)
-         || chunk_is_token(pc, CT_BIT_COLON)
-         || chunk_is_token(pc, CT_CASE_COLON)
-         || chunk_is_token(pc, CT_CLASS_COLON)
-         || chunk_is_token(pc, CT_COLON)
-         || chunk_is_token(pc, CT_COND_COLON)
-         || chunk_is_token(pc, CT_CONSTR_COLON)
-         || chunk_is_token(pc, CT_CS_SQ_COLON)
-         || chunk_is_token(pc, CT_D_ARRAY_COLON)
-         || chunk_is_token(pc, CT_FOR_COLON)
-         || chunk_is_token(pc, CT_LABEL_COLON)
-         || chunk_is_token(pc, CT_OC_COLON)
-         || chunk_is_token(pc, CT_OC_DICT_COLON)
-         || chunk_is_token(pc, CT_TAG_COLON)
-         || chunk_is_token(pc, CT_WHERE_COLON));
-}
-
-
-static inline bool chunk_is_single_line_comment(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_COMMENT)
-         || chunk_is_token(pc, CT_COMMENT_CPP));
-}
-
-
-// TODO remove when possible
-static inline bool chunk_is_newline(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_NEWLINE)
-         || chunk_is_token(pc, CT_NL_CONT));
-}
-
-
-static inline bool chunk_is_semicolon(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_SEMICOLON)
-         || chunk_is_token(pc, CT_VSEMICOLON));
-}
-
-
-static inline bool chunk_is_Doxygen_comment(Chunk *pc)
-{
-   if (  pc == nullptr
-      || !pc->IsComment())
-   {
-      return(false);
-   }
-   // check the third character
-   const char   *sComment = pc->Text();
-   const size_t len       = strlen(sComment);
-
-   if (len < 3)
-   {
-      return(false);
-   }
-   return(  (sComment[2] == '/')
-         || (sComment[2] == '!')
-         || (sComment[2] == '@'));
-}
-
-
-static inline bool chunk_is_type(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_PTR_TYPE)
-         || chunk_is_token(pc, CT_BYREF)
-         || chunk_is_token(pc, CT_DC_MEMBER)
-         || chunk_is_token(pc, CT_QUALIFIER)
-         || chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_ENUM)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-static inline bool chunk_is_str(Chunk *pc, const char *str)
-{
-   size_t len = strlen(str);
-
-   return(  pc != nullptr                         // valid pc pointer
-         && (pc->Len() == len)                    // token size equals size parameter
-         && (memcmp(pc->Text(), str, len) == 0)); // token name is the same as str parameter
-
-   /*
-    * TODO: possible access beyond array for memcmp, check this
-    * why not use strncmp here?
-    */
-}
-
-
-static inline bool chunk_is_str_case(Chunk *pc, const char *str, size_t len)
-{
-   return(  pc != nullptr
-         && (pc->Len() == len)
-         && (strncasecmp(pc->Text(), str, len) == 0));
-}
-
-
-static inline bool chunk_is_word(Chunk *pc)
-{
-   return(  pc != nullptr
-         && (pc->Len() >= 1)
-         && CharTable::IsKw1(pc->str[0]));
-}
-
-
-static inline bool chunk_is_nullable(Chunk *pc)
-{
-   return(  language_is_set(LANG_CS | LANG_VALA)
-         && (pc != nullptr)
-         && (pc->Len() == 1)
-         && (pc->str[0] == '?'));
-}
-
-
-static inline bool chunk_is_addr(Chunk *pc)
-{
-   if (  pc != nullptr
-      && pc->IsNotNullChunk()
-      && (  chunk_is_token(pc, CT_BYREF)
-         || (  (pc->Len() == 1)
-            && (pc->str[0] == '&')
-            && pc->type != CT_OPERATOR_VAL)))
-   {
-      Chunk *prev = pc->GetPrev();
-
-      if (  pc->flags.test(PCF_IN_TEMPLATE)
-         && (  chunk_is_token(prev, CT_COMMA)
-            || chunk_is_token(prev, CT_ANGLE_OPEN)))
-      {
-         return(false);
-      }
-      return(true);
-   }
-   return(false);
-}
-
-
-static inline bool chunk_is_msref(Chunk *pc) // ms compilers for C++/CLI and WinRT use '^' instead of '*' for marking up reference types vs pointer types
-{
-   return(  language_is_set(LANG_CPP)
-         && (  pc != nullptr
-            && (pc->Len() == 1)
-            && (pc->str[0] == '^')
-            && pc->type != CT_OPERATOR_VAL));
-}
-
-
-static inline bool chunk_is_ptr_operator(Chunk *pc)
-{
-   return(  pc != nullptr
-         && (  (  pc->IsStar()
-               || chunk_is_addr(pc)
-               || chunk_is_msref(pc))
-            || chunk_is_nullable(pc)));
-}
-
-
-static inline bool chunk_is_pointer_or_reference(Chunk *pc)
-{
-   return(  chunk_is_ptr_operator(pc)
-         || chunk_is_token(pc, CT_BYREF));
-}
-
-
-//! Check to see if there is a newline between the two chunks
-bool chunk_is_newline_between(Chunk *start, Chunk *end);
-
-
-static inline bool chunk_is_closing_brace(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE));
-}
-
-
-static inline bool chunk_is_opening_brace(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_OPEN));
-}
-
-
-static inline bool chunk_is_paren_open(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_PAREN_OPEN)
-         || chunk_is_token(pc, CT_SPAREN_OPEN)
-         || chunk_is_token(pc, CT_TPAREN_OPEN)
-         || chunk_is_token(pc, CT_FPAREN_OPEN)
-         || chunk_is_token(pc, CT_LPAREN_OPEN));
-}
-
-
-static inline bool chunk_is_paren_close(Chunk *pc)
-{
-   return(  chunk_is_token(pc, CT_PAREN_CLOSE)
-         || chunk_is_token(pc, CT_SPAREN_CLOSE)
-         || chunk_is_token(pc, CT_TPAREN_CLOSE)
-         || chunk_is_token(pc, CT_FPAREN_CLOSE));
-}
-
-
-/**
- * Returns true if either chunk is null or both have the same preproc flags.
- * If this is true, you can remove a newline/nl_cont between the two.
- */
-static inline bool chunk_same_preproc(Chunk *pc1, Chunk *pc2)
-{
-   return(  pc1 == nullptr
-         || pc1->IsNullChunk()
-         || pc2 == nullptr
-         || pc2->IsNullChunk()
-         || ((pc1->flags & PCF_IN_PREPROC) == (pc2->flags & PCF_IN_PREPROC)));
-}
-
-
-/**
- * Returns true if it is safe to delete the newline token.
- * The prev and next chunks must have the same PCF_IN_PREPROC flag AND
- * the newline can't be after a C++ comment.
- */
-static inline bool chunk_safe_to_del_nl(Chunk *nl)
-{
-   if (nl == nullptr)
-   {
-      nl = Chunk::NullChunkPtr;
-   }
-   Chunk *tmp = nl->GetPrev();
-
-   if (chunk_is_token(tmp, CT_COMMENT_CPP))
-   {
-      return(false);
-   }
-   return(chunk_same_preproc(tmp, nl->GetNext()));
-}
-
-
-/**
- * Checks if a chunk points to the opening parenthese of a
- * for(...in...) loop in Objective-C.
- *
- * @return true  - the chunk is the opening parentheses of a for in loop
- */
-static inline bool chunk_is_forin(Chunk *pc)
-{
-   if (  language_is_set(LANG_OC)
-      && chunk_is_token(pc, CT_SPAREN_OPEN))
-   {
-      Chunk *prev = pc->GetPrevNcNnl();
-
-      if (chunk_is_token(prev, CT_FOR))
-      {
-         Chunk *next = pc;
-
-         while (  next != nullptr
-               && next->type != CT_SPAREN_CLOSE
-               && next->type != CT_IN)
-         {
-            next = next->GetNextNcNnl();
-         }
-
-         if (chunk_is_token(next, CT_IN))
-         {
-            return(true);
-         }
-      }
-   }
-   return(false);
-}
-
-
-/**
- * Returns true if pc is an CT_ATTRIBUTE or CT_DECLSPEC
- */
-bool chunk_is_attribute_or_declspec(Chunk *pc);
-
-
-/**
- * Returns true if pc is one of CT_CLASS, CT_ENUM, CT_ENUM_CLASS, CT_STRUCT or CT_UNION
- */
-bool chunk_is_class_enum_struct_union(Chunk *pc);
-
-
-/**
- * Returns true if pc is a CT_CLASS or CT_STRUCT
- */
-bool chunk_is_class_or_struct(Chunk *pc);
-
-
-/**
- * Returns true if pc is one of CT_CLASS, CT_STRUCT or CT_UNION
- */
-bool chunk_is_class_struct_union(Chunk *pc);
-
-
-/**
- * Returns true if pc is a CT_ENUM or CT_ENUM_CLASS
- */
-bool chunk_is_enum(Chunk *pc);
-
-
-void set_chunk_type_real(Chunk *pc, E_Token tt, const char *func, int line);
-
-
-void set_chunk_parent_real(Chunk *pc, E_Token tt, const char *func, int line);
-
-
-#define set_chunk_type(pc, tt)      set_chunk_type_real((pc), (tt), __unqualified_func__, __LINE__)
-
-
-#define set_chunk_parent(pc, tt)    set_chunk_parent_real((pc), (tt), __unqualified_func__, __LINE__)
-
-
-E_Token get_chunk_parent_type(Chunk *pc);
-
-
-void chunk_flags_set_real(Chunk *pc, pcf_flags_t clr_bits, pcf_flags_t set_bits);
-
-
-#define chunk_flags_upd(pc, cc, ss)    chunk_flags_set_real((pc), (cc), (ss))
-
-
-#define chunk_flags_set(pc, ss)        chunk_flags_set_real((pc), {}, (ss))
-
-
-#define chunk_flags_clr(pc, cc)        chunk_flags_set_real((pc), (cc), {})
-
-
-void chunk_set_parent(Chunk *pc, Chunk *parent);
-
-
-E_Token get_type_of_the_parent(Chunk *pc);
-
-
-/**
- * @brief compare the positions of two tokens in a file.
- *
- * The function compares the two positions of two tokens.
- *
- * @param A_token
- * @param B_token
- *
- * @return returns an integer less than, equal to, or greater than zero
- *         if A_token is found, respectively, to be less/before than, to
- *         match, or be greater/after than B_token.
- */
-int chunk_compare_position(const Chunk *A_token, const Chunk *B_token);
-
-
-#endif /* CHUNK_LIST_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.cpp
deleted file mode 100644
index 72e91b1a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.cpp
+++ /dev/null
@@ -1,443 +0,0 @@
-/**
- * @file combine_labels.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.h
- */
-
-#include "combine_labels.h"
-
-#include "chunk.h"
-#include "cs_top_is_question.h"
-#include "uncrustify.h"
-
-
-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);
-   } while (  tmp->IsNotNullChunk()
-           && (  tmp->IsComment()
-              || chunk_is_token(tmp, CT_NOEXCEPT)));
-
-   return(tmp);
-}
-
-
-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);
-   } while (  tmp->IsNotNullChunk()
-           && (  tmp->IsComment()
-              || chunk_is_newline(tmp)
-              || chunk_is_token(tmp, CT_NOEXCEPT)));
-
-   return(tmp);
-}
-
-
-void combine_labels(void)
-{
-   LOG_FUNC_ENTRY();
-   bool hit_case  = false;
-   bool hit_class = false;
-
-   cpd.unc_stage = unc_stage_e::COMBINE_LABELS;
-
-   // stack to handle nesting inside of OC messages, which reset the scope
-   ChunkStack cs;
-
-   Chunk      *prev = Chunk::GetHead();
-
-   if (prev->IsNullChunk())
-   {
-      return;
-   }
-   Chunk *cur = prev->GetNextNc();
-
-   if (cur->IsNullChunk())
-   {
-      return;
-   }
-   Chunk *next = cur->GetNextNc();
-
-   // unlikely that the file will start with a label...
-   // prev cur next
-   while (  next != nullptr
-         && next->IsNotNullChunk())
-   {
-      if (chunk_is_token(next, CT_NEWLINE))
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->nl_count);
-      }
-      else if (chunk_is_token(next, CT_VBRACE_OPEN))
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, VBRACE_OPEN\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col);
-      }
-      else if (chunk_is_token(next, CT_VBRACE_CLOSE))
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, VBRACE_CLOSE\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col);
-      }
-      else
-      {
-         LOG_FMT(LFCN, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->Text());
-      }
-
-      if (  !next->flags.test(PCF_IN_OC_MSG) // filter OC case of [self class] msg send
-         && (  chunk_is_token(next, CT_CLASS)
-            || chunk_is_token(next, CT_OC_CLASS)
-            || chunk_is_token(next, CT_TEMPLATE)))
-      {
-         hit_class = true;
-      }
-
-      if (  chunk_is_semicolon(next)
-         || chunk_is_token(next, CT_BRACE_OPEN))
-      {
-         hit_class = false;
-      }
-
-      if (  chunk_is_token(prev, CT_SQUARE_OPEN)
-         && get_chunk_parent_type(prev) == CT_OC_MSG)
-      {
-         cs.Push_Back(prev);
-      }
-      else if (  chunk_is_token(next, CT_SQUARE_CLOSE)
-              && get_chunk_parent_type(next) == CT_OC_MSG)
-      {
-         // pop until we hit '['
-         while (!cs.Empty())
-         {
-            Chunk *t2 = cs.Top()->m_pc;
-            cs.Pop_Back();
-
-            if (chunk_is_token(t2, CT_SQUARE_OPEN))
-            {
-               break;
-            }
-         }
-      }
-
-      if (  chunk_is_token(next, CT_QUESTION)
-         && !next->flags.test(PCF_IN_TEMPLATE))
-      {
-         cs.Push_Back(next);
-      }
-      else if (chunk_is_token(next, CT_CASE))
-      {
-         if (chunk_is_token(cur, CT_GOTO))
-         {
-            // handle "goto case x;"
-            set_chunk_type(next, CT_QUALIFIER);
-         }
-         else
-         {
-            hit_case = true;
-         }
-      }
-      else if (  chunk_is_token(next, CT_COLON)
-              || (  chunk_is_token(next, CT_OC_COLON)
-                 && cs_top_is_question(cs, next->level)))
-      {
-         if (chunk_is_token(cur, CT_DEFAULT))
-         {
-            set_chunk_type(cur, CT_CASE);
-            hit_case = true;
-         }
-
-         if (cs_top_is_question(cs, next->level))
-         {
-            set_chunk_type(next, CT_COND_COLON);
-            cs.Pop_Back();
-         }
-         else if (hit_case)
-         {
-            hit_case = false;
-            set_chunk_type(next, CT_CASE_COLON);
-            Chunk *tmp = next->GetNextNcNnlNpp();                // Issue #2150
-
-            if (chunk_is_token(tmp, CT_BRACE_OPEN))
-            {
-               set_chunk_parent(tmp, CT_CASE);
-               tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->level);
-
-               if (tmp->IsNotNullChunk())
-               {
-                  set_chunk_parent(tmp, CT_CASE);
-               }
-            }
-
-            if (  chunk_is_token(cur, CT_NUMBER)
-               && chunk_is_token(prev, CT_ELLIPSIS))
-            {
-               Chunk *pre_elipsis = prev->GetPrevNcNnlNpp();
-
-               if (chunk_is_token(pre_elipsis, CT_NUMBER))
-               {
-                  set_chunk_type(prev, CT_CASE_ELLIPSIS);
-               }
-            }
-         }
-         else if (cur->flags.test(PCF_IN_WHERE_SPEC))
-         {
-            /* leave colons in where-constraint clauses alone */
-         }
-         else
-         {
-            LOG_FMT(LFCN, "%s(%d): prev->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                    __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col);
-            LOG_FMT(LFCN, "%s(%d): cur->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                    __func__, __LINE__, cur->Text(), cur->orig_line, cur->orig_col);
-            LOG_FMT(LFCN, "%s(%d): next->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                    __func__, __LINE__, next->Text(), next->orig_line, next->orig_col);
-            Chunk *nextprev = chunk_get_prev_local(next);   // Issue #2279
-
-            if (nextprev == nullptr)
-            {
-               return;
-            }
-
-            if (language_is_set(LANG_PAWN))
-            {
-               if (  chunk_is_token(cur, CT_WORD)
-                  || chunk_is_token(cur, CT_BRACE_CLOSE))
-               {
-                  E_Token new_type = CT_TAG;
-
-                  Chunk   *tmp = next->GetNextNc();
-
-                  if (tmp->IsNullChunk())
-                  {
-                     return;
-                  }
-
-                  if (  chunk_is_newline(prev)
-                     && chunk_is_newline(tmp))
-                  {
-                     new_type = CT_LABEL;
-                     set_chunk_type(next, CT_LABEL_COLON);
-                  }
-                  else
-                  {
-                     set_chunk_type(next, CT_TAG_COLON);
-                  }
-
-                  if (chunk_is_token(cur, CT_WORD))
-                  {
-                     set_chunk_type(cur, new_type);
-                  }
-               }
-            }
-            else if (next->flags.test(PCF_IN_ARRAY_ASSIGN))
-            {
-               set_chunk_type(next, CT_D_ARRAY_COLON);
-            }
-            else if (next->flags.test(PCF_IN_FOR))
-            {
-               set_chunk_type(next, CT_FOR_COLON);
-            }
-            else if (next->flags.test(PCF_OC_BOXED))
-            {
-               set_chunk_type(next, CT_OC_DICT_COLON);
-            }
-            else if (chunk_is_token(cur, CT_WORD))
-            {
-               Chunk *tmp = next->GetNextNc(E_Scope::PREPROC);
-
-               // Issue #1187
-               if (tmp->IsNullChunk())
-               {
-                  return;
-               }
-               LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, tmp '%s': ",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-                       (chunk_is_token(tmp, CT_NEWLINE)) ? "<Newline>" : tmp->Text());
-               log_pcf_flags(LGUY, tmp->flags);
-
-               if (next->flags.test(PCF_IN_FCN_CALL))
-               {
-                  // Must be a macro thingy, assume some sort of label
-                  set_chunk_type(next, CT_LABEL_COLON);
-               }
-               else if (  tmp->IsNullChunk()
-                       || (  chunk_is_not_token(tmp, CT_NUMBER)
-                          && chunk_is_not_token(tmp, CT_DECLTYPE)
-                          && chunk_is_not_token(tmp, CT_SIZEOF)
-                          && get_chunk_parent_type(tmp) != CT_SIZEOF
-                          && !tmp->flags.test_any(PCF_IN_STRUCT | PCF_IN_CLASS))
-                       || chunk_is_token(tmp, CT_NEWLINE))
-               {
-                  /*
-                   * the CT_SIZEOF isn't great - test 31720 happens to use a sizeof expr,
-                   * but this really should be able to handle any constant expr
-                   */
-                  // Fix for #1242
-                  // For MIDL_INTERFACE classes class name is tokenized as Label.
-                  // Corrected the identification of Label in c style languages.
-                  if (  language_is_set(LANG_C | LANG_CPP | LANG_CS)
-                     && (!language_is_set(LANG_OC)))
-                  {
-                     Chunk *labelPrev = prev;
-
-                     if (chunk_is_token(labelPrev, CT_NEWLINE))
-                     {
-                        labelPrev = prev->GetPrevNcNnlNi();   // Issue #2279
-                     }
-
-                     if (  labelPrev->IsNotNullChunk()
-                        && chunk_is_not_token(labelPrev, CT_FPAREN_CLOSE))
-                     {
-                        set_chunk_type(cur, CT_LABEL);
-                        set_chunk_type(next, CT_LABEL_COLON);
-                     }
-                  }
-                  else
-                  {
-                     set_chunk_type(cur, CT_LABEL);
-                     set_chunk_type(next, CT_LABEL_COLON);
-                  }
-               }
-               else if (next->flags.test_any(PCF_IN_STRUCT | PCF_IN_CLASS | PCF_IN_TYPEDEF))
-               {
-                  set_chunk_type(next, CT_BIT_COLON);
-
-                  Chunk *nnext = next->GetNext();
-
-                  if (nnext->IsNullChunk())
-                  {
-                     return;
-                  }
-
-                  while ((nnext = nnext->GetNext())->IsNotNullChunk())
-                  {
-                     if (chunk_is_token(nnext, CT_SEMICOLON))
-                     {
-                        break;
-                     }
-
-                     if (chunk_is_token(nnext, CT_COLON))
-                     {
-                        set_chunk_type(nnext, CT_BIT_COLON);
-                     }
-                  }
-               }
-            }
-            else if (chunk_is_token(nextprev, CT_FPAREN_CLOSE))
-            {
-               LOG_FMT(LFCN, "%s(%d): nextprev->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                       __func__, __LINE__, nextprev->Text(), nextprev->orig_line, nextprev->orig_col,
-                       get_token_name(nextprev->type));
-               LOG_FMT(LFCN, "%s(%d): next->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                       __func__, __LINE__, next->Text(), next->orig_line, next->orig_col,
-                       get_token_name(next->type));
-
-               // Issue #2172
-               if (get_chunk_parent_type(next) == CT_FUNC_DEF)
-               {
-                  LOG_FMT(LFCN, "%s(%d): it's a construct colon\n", __func__, __LINE__);
-                  // it's a construct colon
-                  set_chunk_type(next, CT_CONSTR_COLON);
-               }
-               else
-               {
-                  LOG_FMT(LFCN, "%s(%d): it's a class colon\n", __func__, __LINE__);
-                  // it's a class colon
-                  set_chunk_type(next, CT_CLASS_COLON);
-               }
-            }
-            else if (next->level > next->brace_level)
-            {
-               // ignore it, as it is inside a paren
-            }
-            else if (  chunk_is_token(cur, CT_TYPE)
-                    || chunk_is_token(cur, CT_ENUM)       // Issue #2584
-                    || chunk_is_token(nextprev, CT_TYPE)
-                    || chunk_is_token(nextprev, CT_ENUM)) // Issue #2584
-            {
-               set_chunk_type(next, CT_BIT_COLON);
-            }
-            else if (  chunk_is_token(cur, CT_ENUM)
-                    || chunk_is_token(cur, CT_ACCESS)
-                    || chunk_is_token(cur, CT_QUALIFIER)
-                    || get_chunk_parent_type(cur) == CT_ALIGN)
-            {
-               // ignore it - bit field, align or public/private, etc
-            }
-            else if (  chunk_is_token(cur, CT_ANGLE_CLOSE)
-                    || hit_class)
-            {
-               // ignore it - template thingy
-            }
-            else if (get_chunk_parent_type(cur) == CT_SQL_EXEC)
-            {
-               // ignore it - SQL variable name
-            }
-            else if (get_chunk_parent_type(next) == CT_ASSERT)
-            {
-               // ignore it - Java assert thing
-            }
-            else if (get_chunk_parent_type(next) == CT_STRUCT)
-            {
-               // ignore it
-            }
-            else
-            {
-               Chunk *tmp = next->GetNextNcNnl();
-
-               //tmp = chunk_get_next_local(next);
-               if (tmp->IsNotNullChunk())
-               {
-                  LOG_FMT(LFCN, "%s(%d): tmp->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                          __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col,
-                          get_token_name(tmp->type));
-
-                  if (  chunk_is_token(tmp, CT_BASE)
-                     || chunk_is_token(tmp, CT_THIS))
-                  {
-                     // ignore it, as it is a C# base thingy
-                  }
-                  else if (language_is_set(LANG_CS | LANG_D))
-                  {
-                     // there should be a better solution for that
-                  }
-                  else
-                  {
-                     LOG_FMT(LWARN, "%s(%d): %s:%zu unexpected colon in col %zu n-parent=%s c-parent=%s l=%zu bl=%zu\n",
-                             __func__, __LINE__,
-                             cpd.filename.c_str(), next->orig_line, next->orig_col,
-                             get_token_name(get_chunk_parent_type(next)),
-                             get_token_name(get_chunk_parent_type(cur)),
-                             next->level, next->brace_level);
-                     cpd.error_count++;
-                  }
-               }
-            }
-         }
-      }
-      prev = cur;
-      cur  = next;
-      next = chunk_get_next_local(next);
-   }
-} // combine_labels
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.cpp
deleted file mode 100644
index 2567470f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.cpp
+++ /dev/null
@@ -1,352 +0,0 @@
-/**
- * @file combine_skip.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#include "combine_skip.h"
-
-#include "combine_tools.h"
-
-
-Chunk *skip_align(Chunk *start)
-{
-   Chunk *pc = start;
-
-   if (chunk_is_token(pc, CT_ALIGN))
-   {
-      pc = pc->GetNextNcNnl();
-
-      if (chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         pc = pc->GetNextType(CT_PAREN_CLOSE, pc->level);
-
-         if (pc->IsNotNullChunk())
-         {
-            pc = pc->GetNextNcNnl();
-         }
-
-         if (chunk_is_token(pc, CT_COLON))
-         {
-            pc = pc->GetNextNcNnl();
-         }
-      }
-   }
-   return(pc);
-}
-
-
-Chunk *skip_expression(Chunk *pc)
-{
-   return(skip_to_expression_end(pc)->GetNextNcNnl());
-}
-
-
-Chunk *skip_expression_rev(Chunk *pc)
-{
-   return(skip_to_expression_start(pc)->GetPrevNcNnlNi());
-}
-
-
-static Chunk *skip_to_expression_edge(Chunk *pc, Chunk *(Chunk::*GetNextFn)(E_Scope scope)const)
-{
-   Chunk *prev = pc;
-
-   if (prev == nullptr)
-   {
-      prev = Chunk::NullChunkPtr;
-   }
-
-   if (prev->IsNotNullChunk())
-   {
-      std::size_t level         = prev->level;
-      Chunk       *next         = prev;
-      std::size_t template_nest = get_cpp_template_angle_nest_level(prev);
-
-      while (  next->IsNotNullChunk()
-            && next->level >= level)
-      {
-         /**
-          * if we encounter a comma or semicolon at the level of the starting chunk,
-          * return the current chunk
-          */
-         if (  next->level == level
-            && (  chunk_is_token(next, CT_COMMA)
-               || chunk_is_semicolon(next)))
-         {
-            break;
-         }
-         /**
-          * check the template nest level; if the current chunk's nest level
-          * is less than that of the starting chunk, return the current chunk
-          */
-         auto next_template_nest = get_cpp_template_angle_nest_level(next);
-
-         if (template_nest > next_template_nest)
-         {
-            break;
-         }
-         prev = next;
-         next = (next->*GetNextFn)(E_Scope::PREPROC);
-      }
-   }
-   return(prev);
-}
-
-
-Chunk *skip_to_expression_end(Chunk *pc)
-{
-   return(skip_to_expression_edge(pc, &Chunk::GetNextNcNnl));
-}
-
-
-Chunk *skip_to_expression_start(Chunk *pc)
-{
-   return(skip_to_expression_edge(pc, &Chunk::GetPrevNcNnlNi));
-}
-
-
-Chunk *skip_to_next_statement(Chunk *pc)
-{
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
-   while (  pc->IsNotNullChunk()
-         && !chunk_is_semicolon(pc)
-         && chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && chunk_is_not_token(pc, CT_BRACE_CLOSE))
-   {
-      pc = pc->GetNextNcNnl();
-   }
-   return(pc);
-}
-
-
-Chunk *skip_parent_types(Chunk *colon)
-{
-   Chunk *pc = colon->GetNextNcNnlNpp();
-
-   while (pc)
-   {
-      // Skip access specifier
-      if (chunk_is_token(pc, CT_ACCESS))
-      {
-         pc = pc->GetNextNcNnlNpp();
-         continue;
-      }
-
-      // Check for a type name
-      if (!(  chunk_is_token(pc, CT_WORD)
-           || chunk_is_token(pc, CT_TYPE)))
-      {
-         LOG_FMT(LPCU,
-                 "%s is confused; expected a word at %zu:%zu "
-                 "following type list at %zu:%zu\n", __func__,
-                 colon->orig_line, colon->orig_col,
-                 pc->orig_line, pc->orig_col);
-         return(colon);
-      }
-      // Get next token
-      Chunk *next = skip_template_next(pc->GetNextNcNnlNpp());
-
-      if (  chunk_is_token(next, CT_DC_MEMBER)
-         || chunk_is_token(next, CT_COMMA))
-      {
-         pc = next->GetNextNcNnlNpp();
-      }
-      else if (next != nullptr)
-      {
-         LOG_FMT(LPCU, "%s -> %zu:%zu ('%s')\n", __func__,
-                 next->orig_line, next->orig_col, next->Text());
-         return(next);
-      }
-      else
-      {
-         break;
-      }
-   }
-   LOG_FMT(LPCU, "%s: did not find end of type list (start was %zu:%zu)\n",
-           __func__, colon->orig_line, colon->orig_col);
-   return(colon);
-} // skip_parent_types
-
-
-Chunk *skip_template_prev(Chunk *ang_close)
-{
-   if (chunk_is_token(ang_close, CT_ANGLE_CLOSE))
-   {
-      Chunk *pc = ang_close->GetPrevType(CT_ANGLE_OPEN, ang_close->level);
-      return(pc->GetPrevNcNnlNi());   // Issue #2279
-   }
-   return(ang_close);
-}
-
-
-Chunk *skip_tsquare_next(Chunk *ary_def)
-{
-   if (ary_def == nullptr)
-   {
-      return(Chunk::NullChunkPtr);
-   }
-
-   if (  chunk_is_token(ary_def, CT_SQUARE_OPEN)
-      || chunk_is_token(ary_def, CT_TSQUARE))
-   {
-      return(ary_def->GetNextNisq());
-   }
-   return(ary_def);
-}
-
-
-Chunk *skip_attribute(Chunk *attr)
-{
-   Chunk *pc = attr;
-
-   while (chunk_is_token(pc, CT_ATTRIBUTE))
-   {
-      pc = pc->GetNextNcNnl();
-
-      if (chunk_is_token(pc, CT_FPAREN_OPEN))
-      {
-         pc = pc->GetNextType(CT_FPAREN_CLOSE, pc->level);
-      }
-   }
-   return(pc);
-}
-
-
-Chunk *skip_attribute_next(Chunk *attr)
-{
-   Chunk *next = skip_attribute(attr);
-
-   if (  next != attr
-      && chunk_is_token(next, CT_FPAREN_CLOSE))
-   {
-      attr = next->GetNextNcNnl();
-   }
-
-   if (attr == nullptr)
-   {
-      return(Chunk::NullChunkPtr);
-   }
-   return(attr);
-}
-
-
-Chunk *skip_attribute_prev(Chunk *fp_close)
-{
-   Chunk *pc = fp_close;
-
-   while (true)
-   {
-      if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-         && get_chunk_parent_type(pc) == CT_ATTRIBUTE)
-      {
-         pc = pc->GetPrevType(CT_ATTRIBUTE, pc->level);
-      }
-      else if (chunk_is_not_token(pc, CT_ATTRIBUTE))
-      {
-         break;
-      }
-      pc = pc->GetPrevNcNnlNi(); // Issue #2279
-
-      if (pc->IsNullChunk())     // Issue #3356
-      {
-         break;
-      }
-   }
-   return(pc);
-}
-
-
-Chunk *skip_declspec(Chunk *pc)
-{
-   if (chunk_is_token(pc, CT_DECLSPEC))
-   {
-      pc = pc->GetNextNcNnl();
-
-      if (chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         pc = chunk_skip_to_match(pc);
-      }
-   }
-   return(pc);
-}
-
-
-Chunk *skip_declspec_next(Chunk *pc)
-{
-   Chunk *next = skip_declspec(pc);
-
-   if (  next != pc
-      && chunk_is_token(next, CT_PAREN_CLOSE))
-   {
-      pc = next->GetNextNcNnl();
-   }
-   return(pc);
-}
-
-
-Chunk *skip_declspec_prev(Chunk *pc)
-{
-   if (  chunk_is_token(pc, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(pc) == CT_DECLSPEC)
-   {
-      pc = chunk_skip_to_match_rev(pc);
-      pc = pc->GetPrevNcNnlNi();
-
-      if (chunk_is_token(pc, CT_DECLSPEC))
-      {
-         pc = pc->GetPrevNcNnlNi();
-      }
-   }
-   return(pc);
-}
-
-
-Chunk *skip_matching_brace_bracket_paren_next(Chunk *pc)
-{
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_SQUARE_OPEN))
-   {
-      pc = chunk_skip_to_match(pc);
-
-      if (pc != nullptr)
-      {
-         /**
-          * a matching brace, square bracket, or paren was found;
-          * retrieve the subsequent chunk
-          */
-
-         pc = pc->GetNextNcNnl();
-      }
-   }
-   return(pc);
-}
-
-
-Chunk *skip_to_chunk_before_matching_brace_bracket_paren_rev(Chunk *pc)
-{
-   if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-      || chunk_is_token(pc, CT_PAREN_CLOSE)
-      || chunk_is_token(pc, CT_SQUARE_CLOSE))
-   {
-      pc = chunk_skip_to_match_rev(pc);
-
-      if (pc != nullptr)
-      {
-         /**
-          * a matching brace, square bracket, or paren was found;
-          * retrieve the preceding chunk
-          */
-
-         pc = pc->GetPrevNcNnlNi();
-      }
-   }
-   return(pc);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.cpp
deleted file mode 100644
index 8a5cbf3f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @file flag_braced_init_list.cpp
- *
- * @license GPL v2+
- */
-
-#include "chunk.h"
-
-#include "flag_braced_init_list.h"
-
-#include "uncrustify.h"
-
-
-bool detect_cpp_braced_init_list(Chunk *pc, Chunk *next)
-{
-   LOG_FUNC_ENTRY();
-   // Issue #2332
-   bool we_have_a_case_before = false;
-
-   if (chunk_is_token(pc, CT_COLON))
-   {
-      // check if we have a case before
-      Chunk *switch_before = pc->GetPrevType(CT_CASE, pc->level);
-
-      if (switch_before->IsNotNullChunk())
-      {
-         LOG_FMT(LFCNR, "%s(%d): switch_before->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                 __func__, __LINE__, switch_before->orig_line, switch_before->orig_col,
-                 switch_before->Text(), get_token_name(switch_before->type));
-         we_have_a_case_before = true;
-      }
-   }
-
-   // Detect a braced-init-list
-   if (  chunk_is_token(pc, CT_WORD)
-      || chunk_is_token(pc, CT_TYPE)
-      || chunk_is_token(pc, CT_ASSIGN)
-      || chunk_is_token(pc, CT_RETURN)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_ANGLE_CLOSE)
-      || chunk_is_token(pc, CT_SQUARE_CLOSE)
-      || chunk_is_token(pc, CT_TSQUARE)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_QUESTION)
-      || (  chunk_is_token(pc, CT_COLON)
-         && !we_have_a_case_before)
-      || (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && (  get_chunk_parent_type(pc) == CT_NONE
-            || get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)))
-   {
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n   ",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
-      log_pcf_flags(LFCNR, pc->flags);
-      auto brace_open = pc->GetNextNcNnl();
-
-      if (  chunk_is_token(brace_open, CT_BRACE_OPEN)
-         && (  get_chunk_parent_type(brace_open) == CT_NONE
-            || get_chunk_parent_type(brace_open) == CT_ASSIGN
-            || get_chunk_parent_type(brace_open) == CT_RETURN
-            || get_chunk_parent_type(brace_open) == CT_BRACED_INIT_LIST))
-      {
-         log_pcf_flags(LFCNR, brace_open->flags);
-         auto brace_close = chunk_skip_to_match(next);
-
-         if (chunk_is_token(brace_close, CT_BRACE_CLOSE))
-         {
-            return(true);
-         }
-      }
-   }
-   return(false);
-} // detect_cpp_braced_init_list
-
-
-void flag_cpp_braced_init_list(Chunk *pc, Chunk *next)
-{
-   auto brace_open  = pc->GetNextNcNnl();
-   auto brace_close = chunk_skip_to_match(next);
-
-   set_chunk_parent(brace_open, CT_BRACED_INIT_LIST);
-   set_chunk_parent(brace_close, CT_BRACED_INIT_LIST);
-
-   auto *tmp = brace_close->GetNextNcNnl();
-
-   if (tmp->IsNotNullChunk())
-   {
-      chunk_flags_clr(tmp, PCF_EXPR_START | PCF_STMT_START);
-
-      // Flag call operator
-      if (chunk_is_token(tmp, CT_PAREN_OPEN))
-      {
-         if (auto *const c = chunk_skip_to_match(tmp))
-         {
-            set_chunk_type(tmp, CT_FPAREN_OPEN);
-            set_chunk_parent(tmp, CT_FUNC_CALL);
-            set_chunk_type(c, CT_FPAREN_CLOSE);
-            set_chunk_parent(c, CT_FUNC_CALL);
-         }
-      }
-   }
-   // TODO: Change pc->type CT_WORD -> CT_TYPE
-   // for the case CT_ASSIGN (and others).
-
-   // TODO: Move this block to the fix_fcn_call_args function.
-   if (  chunk_is_token(pc, CT_WORD)
-      && pc->flags.test(PCF_IN_FCN_CALL))
-   {
-      set_chunk_type(pc, CT_TYPE);
-   }
-} // flag_cpp_braced_init_list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.cpp
deleted file mode 100644
index 0f881553..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file flag_parens.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "flag_parens.h"
-
-#include "uncrustify.h"
-
-
-Chunk *flag_parens(Chunk *po, pcf_flags_t flags, E_Token opentype, E_Token parenttype, bool parent_all)
-{
-   LOG_FUNC_ENTRY();
-   Chunk *paren_close;
-
-   paren_close = chunk_skip_to_match(po, E_Scope::PREPROC);
-
-   if (paren_close == nullptr)
-   {
-      LOG_FMT(LERR, "%s(%d): no match for '%s' at [%zu:%zu]",
-              __func__, __LINE__, po->Text(), po->orig_line, po->orig_col);
-      log_func_stack_inline(LERR);
-      cpd.error_count++;
-      return(nullptr);
-   }
-   LOG_FMT(LFLPAREN, "%s(%d): between  po is '%s', orig_line is %zu, orig_col is %zu, and\n",
-           __func__, __LINE__, po->Text(), po->orig_line, po->orig_col);
-   LOG_FMT(LFLPAREN, "%s(%d): paren_close is '%s', orig_line is %zu, orig_col is %zu, type is %s, parent_type is %s\n",
-           __func__, __LINE__, paren_close->Text(), paren_close->orig_line, paren_close->orig_col,
-           get_token_name(opentype), get_token_name(parenttype));
-   log_func_stack_inline(LFLPAREN);
-
-   // the last chunk must be also modified. Issue #2149
-   Chunk *after_paren_close = paren_close->GetNext();
-
-   if (po != paren_close)
-   {
-      if (  flags != PCF_NONE
-         || (  parent_all
-            && parenttype != CT_NONE))
-      {
-         Chunk *pc;
-
-         for (pc = po->GetNext(E_Scope::PREPROC);
-              pc != nullptr && pc->IsNotNullChunk() && pc != after_paren_close;
-              pc = pc->GetNext(E_Scope::PREPROC))
-         {
-            chunk_flags_set(pc, flags);
-
-            if (parent_all)
-            {
-               set_chunk_parent(pc, parenttype);
-            }
-         }
-      }
-
-      if (opentype != CT_NONE)
-      {
-         set_chunk_type(po, opentype);
-         set_chunk_type(paren_close, (E_Token)(opentype + 1));
-      }
-
-      if (parenttype != CT_NONE)
-      {
-         set_chunk_parent(po, parenttype);
-         set_chunk_parent(paren_close, parenttype);
-      }
-   }
-   return(paren_close->GetNextNcNnl(E_Scope::PREPROC));
-} // flag_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.cpp
deleted file mode 100644
index 82ee8b8e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @file log_rules.cpp
- * is an extract from space.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "log_rules.h"
-
-#include "unc_tools.h"
-
-
-void log_rule2(const char *func, size_t line, const char *rule, Chunk *first, Chunk *second)
-{
-   LOG_FUNC_ENTRY();
-
-   if (second->type != CT_NEWLINE)
-   {
-      LOG_FMT(LSPACE, "%s(%zu): first->orig_line is %zu, first->orig_col is %zu, first->Text() is '%s', [%s/%s] <===>\n",
-              func, line, first->orig_line, first->orig_col, first->Text(),
-              get_token_name(first->type), get_token_name(get_chunk_parent_type(first)));
-      LOG_FMT(LSPACE, "           second->orig_line is %zu, second->orig_col is %zu, second->Text() is '%s', [%s/%s] :",
-              second->orig_line, second->orig_col, second->Text(),
-              get_token_name(second->type), get_token_name(get_chunk_parent_type(second)));
-      LOG_FMT(LSPACE, " rule %s[line %zu]\n",
-              rule, line);
-   }
-}
-
-
-#ifdef SUPER_LOG
-
-
-void log_rule3(log_sev_t sev, const char *func, size_t line, const char *rule)
-#else
-
-
-void log_rule3(log_sev_t sev, const char *func, const char *rule)
-#endif
-{
-   // some Windows platforms provide a qualified function name ("ABC::XYZ::function_Name")
-   // as __func__; call get_unqualified_func_name() to return an unqualified function name
-
-   func = get_unqualified_func_name(func);
-
-#ifdef SUPER_LOG
-   LOG_FMT(sev, "log_rule(%s:%zu): rule is '%s'\n", func, line, rule);
-#else
-   LOG_FMT(sev, "log_rule(%s): rule is '%s'\n", func, rule);
-#endif
-}
-
-
-void log_rule4(const char *rule, Chunk *first)
-{
-   if (cpd.html_file == nullptr)
-   {
-      return;
-   }
-
-   if (first->tracking == nullptr)
-   {
-      first->tracking = new track_list;
-      first->tracking->reserve(3);
-   }
-   // copy the rule
-   size_t length = strlen(rule) + 1;
-   char   *r     = (char *)malloc(length);
-
-   strcpy(r, rule);
-   size_t   a_number = get_A_Number();
-   Track_nr A        = make_pair(a_number, r);
-
-   first->tracking->push_back(A);
-   size_t sizeOfTrack = first->tracking->size();
-
-   LOG_FMT(LSPACE, "log_rule4(%d): rule is '%s', after '%s', at line %zu, tracking number is %zu, size is %zu\n",
-           __LINE__, rule, first->Text(), first->orig_line, a_number, sizeOfTrack);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.cpp
deleted file mode 100644
index 3ed93ef2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @file parent_for_pp.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "parent_for_pp.h"
-
-#include "chunk.h"
-
-
-void do_parent_for_pp(void)
-{
-   LOG_FUNC_ENTRY();
-
-   vector<Chunk *> viz;
-
-   Chunk           *pc = Chunk::GetHead()->GetNextNcNnl();
-
-   while (pc->IsNotNullChunk())
-   {
-      // CT_PP_IF,            // #if, #ifdef, or #ifndef
-      // CT_PP_ELSE,          // #else or #elif
-      // CT_PP_ENDIF,         // #endif
-      if (chunk_is_token(pc, CT_PP_IF))
-      {
-         LOG_FMT(LMCB, "%s(%d): IF: orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-         log_pcf_flags(LMCB, pc->flags);
-         viz.push_back(pc);
-      }
-      else if (chunk_is_token(pc, CT_PP_ELSE))
-      {
-         LOG_FMT(LMCB, "%s(%d): ELSE: orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-         log_pcf_flags(LMCB, pc->flags);
-         size_t level = pc->pp_level;
-         Chunk  *a    = viz.at(level - 1);
-         chunk_set_parent(pc, a);
-      }
-      else if (chunk_is_token(pc, CT_PP_ENDIF))
-      {
-         LOG_FMT(LMCB, "%s(%d): ENDIF: orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-         log_pcf_flags(LMCB, pc->flags);
-         size_t level = pc->pp_level;
-         Chunk  *a    = viz.at(level);
-         chunk_set_parent(pc, a);
-         viz.pop_back();
-      }
-      pc = pc->GetNextNcNnl();
-   }
-} // do_parent_for_pp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.cpp
deleted file mode 100644
index 45dd3943..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file quick_align_again.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "quick_align_again.h"
-
-#include "align_stack.h"
-#include "chunk.h"
-
-
-void quick_align_again(void)
-{
-   LOG_FUNC_ENTRY();
-
-   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
-   {
-      char copy[1000];
-      LOG_FMT(LALAGAIN, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, Text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->ElidedText(copy));
-
-      if (  pc->align.next != nullptr
-         && pc->flags.test(PCF_ALIGN_START))
-      {
-         AlignStack as;
-         as.Start(100, 0);
-         as.m_right_align = pc->align.right_align;
-         as.m_star_style  = static_cast<AlignStack::StarStyle>(pc->align.star_style);
-         as.m_amp_style   = static_cast<AlignStack::StarStyle>(pc->align.amp_style);
-         as.m_gap         = pc->align.gap;
-
-         LOG_FMT(LALAGAIN, "%s(%d):   pc->Text() is '%s', orig_line is %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line);
-         as.Add(pc->align.start);
-         chunk_flags_set(pc, PCF_WAS_ALIGNED);
-
-         for (Chunk *tmp = pc->align.next; tmp != nullptr; tmp = tmp->align.next)
-         {
-            chunk_flags_set(tmp, PCF_WAS_ALIGNED);
-            as.Add(tmp->align.start);
-            LOG_FMT(LALAGAIN, "%s(%d):    => tmp->Text() is '%s', orig_line is %zu\n",
-                    __func__, __LINE__, tmp->Text(), tmp->orig_line);
-         }
-
-         LOG_FMT(LALAGAIN, "\n");
-         as.End();
-      }
-   }
-} // quick_align_again
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.cpp
deleted file mode 100644
index 6f78099c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * @file semicolons.cpp
- * Removes extra semicolons
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "semicolons.h"
-
-#include "prototypes.h"
-
-
-static void remove_semicolon(Chunk *pc);
-
-
-/**
- * We are on a semicolon that is after an unidentified brace close.
- * Check for what is before the brace open.
- * Do not remove if it is a square close, word, type, or paren close.
- */
-static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close);
-
-
-static void remove_semicolon(Chunk *pc)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LDELSEMI, "%s(%d): Removed semicolon: orig_line is %zu, orig_col is %zu",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
-   log_func_stack_inline(LDELSEMI);
-   // TODO: do we want to shift stuff back a column?
-   chunk_del(pc);
-}
-
-
-void remove_extra_semicolons(void)
-{
-   LOG_FUNC_ENTRY();
-
-   Chunk *pc = Chunk::GetHead();
-
-   while (pc->IsNotNullChunk())
-   {
-      Chunk *next = pc->GetNextNcNnl();
-      Chunk *prev;
-
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && !pc->flags.test(PCF_IN_PREPROC)
-         && (prev = pc->GetPrevNcNnl())->IsNotNullChunk())
-      {
-         LOG_FMT(LSCANSEMI, "%s(%d): Semi orig_line is %zu, orig_col is %zu, parent is %s, prev = '%s' [%s/%s]\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(get_chunk_parent_type(pc)),
-                 prev->Text(),
-                 get_token_name(prev->type), get_token_name(get_chunk_parent_type(prev)));
-
-         if (get_chunk_parent_type(pc) == CT_TYPEDEF)
-         {
-            // keep it
-         }
-         else if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-                 && (  get_chunk_parent_type(prev) == CT_IF
-                    || get_chunk_parent_type(prev) == CT_ELSEIF
-                    || get_chunk_parent_type(prev) == CT_ELSE
-                    || get_chunk_parent_type(prev) == CT_SWITCH
-                    || get_chunk_parent_type(prev) == CT_WHILE
-                    || get_chunk_parent_type(prev) == CT_USING_STMT
-                    || get_chunk_parent_type(prev) == CT_FOR
-                    || get_chunk_parent_type(prev) == CT_FUNC_DEF
-                    || get_chunk_parent_type(prev) == CT_OC_MSG_DECL
-                    || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF
-                    || get_chunk_parent_type(prev) == CT_NAMESPACE))
-         {
-            remove_semicolon(pc);
-         }
-         else if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-                 && get_chunk_parent_type(prev) == CT_NONE)
-         {
-            check_unknown_brace_close(pc, prev);
-         }
-         else if (  chunk_is_token(prev, CT_SEMICOLON)
-                 && get_chunk_parent_type(prev) != CT_FOR)
-         {
-            remove_semicolon(pc);
-         }
-         else if (  language_is_set(LANG_D)
-                 && (  get_chunk_parent_type(prev) == CT_ENUM
-                    || get_chunk_parent_type(prev) == CT_UNION
-                    || get_chunk_parent_type(prev) == CT_STRUCT))
-         {
-            remove_semicolon(pc);
-         }
-         else if (  language_is_set(LANG_JAVA)
-                 && get_chunk_parent_type(prev) == CT_SYNCHRONIZED)
-         {
-            remove_semicolon(pc);
-         }
-         else if (chunk_is_token(prev, CT_BRACE_OPEN))
-         {
-            remove_semicolon(pc);
-         }
-      }
-      pc = next;
-   }
-} // remove_extra_semicolons
-
-
-static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close)
-{
-   LOG_FUNC_ENTRY();
-   Chunk *pc = brace_close->GetPrevType(CT_BRACE_OPEN, brace_close->level);
-
-   pc = pc->GetPrevNcNnl();
-
-   if (  pc->IsNotNullChunk()
-      && pc->type != CT_RETURN
-      && pc->type != CT_WORD
-      && pc->type != CT_TYPE
-      && pc->type != CT_SQUARE_CLOSE
-      && pc->type != CT_ANGLE_CLOSE
-      && pc->type != CT_TSQUARE
-      && !chunk_is_paren_close(pc))
-   {
-      remove_semicolon(semi);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_ctype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_ctype.h
deleted file mode 100644
index 50b7a6f3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_ctype.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file unc_ctype.h
- * The ctype function are only required to handle values 0-255 and EOF.
- * A char is sign-extended when cast to an int.
- * With some C libraries, these values cause a crash.
- * These wrappers will properly handle all char values.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef UNC_CTYPE_H_INCLUDED
-#define UNC_CTYPE_H_INCLUDED
-
-#include "options.h"
-
-#include <cctype>                    // to get std::tolower
-
-// TODO: better avoid inline and move implementation to cpp file
-
-
-//! Test anything EOF (-1) to 0-255
-static inline int unc_fix_ctype(int ch)
-{
-   if (  ch >= -1
-      && ch <= 255)
-   {
-      return(ch);
-   }
-   return(0);                                // Issue #3025
-}
-
-
-//! check if a character is a space
-static inline int unc_isspace(int ch)
-{
-   if (  (ch == 12)                          // Issue #2386
-      && uncrustify::options::use_form_feed_no_more_as_whitespace_character())
-   {
-      return(0);
-   }
-   else
-   {
-      return(isspace(unc_fix_ctype(ch)));
-   }
-}
-
-
-//! check if a character is a printing character
-static inline int unc_isprint(int ch)
-{
-   return(isprint(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is an alphabetic character (a letter).
-static inline int unc_isalpha(int ch)
-{
-   return(isalpha(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is an alphanumeric character.
-static inline int unc_isalnum(int ch)
-{
-   return(isalnum(unc_fix_ctype(ch)));
-}
-
-
-//! convert a character to upper case
-static inline int unc_toupper(int ch)
-{
-   return(toupper(unc_fix_ctype(ch)));
-}
-
-
-//! convert a character to lower case
-static inline int unc_tolower(int ch)
-{
-   return(tolower(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is a hexadecimal digit
-static inline int unc_isxdigit(int ch)
-{
-   return(isxdigit(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is a decimal digit
-static inline int unc_isdigit(int ch)
-{
-   return(isdigit(unc_fix_ctype(ch)));
-}
-
-
-//! check if a character is upper case
-static inline int unc_isupper(int ch)
-{
-   return(  isalpha(unc_fix_ctype(ch))
-         && (unc_toupper(unc_fix_ctype(ch)) == ch));
-}
-
-
-#endif /* UNC_CTYPE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/28.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/28.txt
deleted file mode 100644
index 7dc7aab8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/28.txt
+++ /dev/null
@@ -1,428 +0,0 @@
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(parse_next : rule is 'disable_processing_nl_cont'
-log_rule(tokenize : rule is 'newlines'
-brace_cleanup : orig_line is 1, orig_col is 1, Text() is 'struct'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 1, orig_col is 1, type is STRUCT, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 1, type is STRUCT, Text() is 'struct'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 1, orig_col is 8, Text() is 'TelegramIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 1, orig_col is 8, type is TYPE, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 1, type is TYPE, Text() is 'TelegramIndex'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 1, orig_col is 21, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 2, orig_col is 1, Text() is '{'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 2, orig_col is 1, type is BRACE_OPEN, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 2, type is BRACE_OPEN, Text() is '{'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 2, orig_col is 2, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 3, orig_col is 1, Text() is 'TelegramIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is WORD, Text() is 'TelegramIndex'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 3, orig_col is 14, Text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 14, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is PAREN_OPEN, Text() is '('
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 3, orig_col is 15, Text() is 'const'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 15, type is QUALIFIER, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is QUALIFIER, Text() is 'const'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-brace_cleanup : orig_line is 3, orig_col is 21, Text() is 'char'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 21, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is TYPE, Text() is 'char'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-brace_cleanup : orig_line is 3, orig_col is 25, Text() is '*'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 25, type is PTR_TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is PTR_TYPE, Text() is '*'
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
-brace_cleanup : orig_line is 3, orig_col is 27, Text() is 'pN'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 27, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is WORD, Text() is 'pN'
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
-brace_cleanup : orig_line is 3, orig_col is 29, Text() is ','
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 29, type is COMMA, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is COMMA, Text() is ','
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 5
-brace_cleanup : orig_line is 3, orig_col is 31, Text() is 'unsigned'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 31, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is TYPE, Text() is 'unsigned'
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-brace_cleanup : orig_line is 3, orig_col is 40, Text() is 'long'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 40, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is TYPE, Text() is 'long'
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-brace_cleanup : orig_line is 3, orig_col is 45, Text() is 'nI'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 45, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is WORD, Text() is 'nI'
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
-brace_cleanup : orig_line is 3, orig_col is 47, Text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 47, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is PAREN_CLOSE, Text() is ')'
-parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
-brace_cleanup : orig_line is 3, orig_col is 49, Text() is ':'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 3, orig_col is 49, type is COLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 3, type is COLON, Text() is ':'
-parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 12, frm.expr_count is 5
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 3, orig_col is 50, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 4, orig_col is 1, Text() is 'pTelName'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is WORD, Text() is 'pTelName'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 4, orig_col is 9, Text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 9, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is PAREN_OPEN, Text() is '('
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 4, orig_col is 10, Text() is 'pN'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 10, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is WORD, Text() is 'pN'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-brace_cleanup : orig_line is 4, orig_col is 12, Text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is PAREN_CLOSE, Text() is ')'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-brace_cleanup : orig_line is 4, orig_col is 13, Text() is ','
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 4, orig_col is 13, type is COMMA, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 4, type is COMMA, Text() is ','
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
-brace_cleanup : orig_line is 4, orig_col is 14, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 5, orig_col is 1, Text() is 'nTelIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is WORD, Text() is 'nTelIndex'
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
-brace_cleanup : orig_line is 5, orig_col is 10, Text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 10, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is PAREN_OPEN, Text() is '('
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 2
-brace_cleanup : orig_line is 5, orig_col is 11, Text() is 'n'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 11, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is WORD, Text() is 'n'
-parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-brace_cleanup : orig_line is 5, orig_col is 12, Text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 5, orig_col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 5, type is PAREN_CLOSE, Text() is ')'
-parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-brace_cleanup : orig_line is 5, orig_col is 13, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 6, orig_col is 1, Text() is '{'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 6, orig_col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 6, type is BRACE_OPEN, Text() is '{'
-parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 6, orig_col is 2, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 7, orig_col is 1, Text() is '}'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 7, orig_col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 7, type is BRACE_CLOSE, Text() is '}'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 7, orig_col is 2, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 9, orig_col is 1, Text() is '~'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 1, type is INV, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is INV, Text() is '~'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 9, orig_col is 2, Text() is 'TelegramIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 2, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is WORD, Text() is 'TelegramIndex'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
-brace_cleanup : orig_line is 9, orig_col is 15, Text() is '('
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 15, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is PAREN_OPEN, Text() is '('
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 2
-brace_cleanup : orig_line is 9, orig_col is 16, Text() is ')'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 9, orig_col is 16, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 9, type is PAREN_CLOSE, Text() is ')'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
-brace_cleanup : orig_line is 9, orig_col is 17, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 10, orig_col is 1, Text() is '{'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 10, orig_col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 10, type is BRACE_OPEN, Text() is '{'
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 10, orig_col is 2, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 11, orig_col is 1, Text() is '}'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 11, orig_col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 11, type is BRACE_CLOSE, Text() is '}'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 11, orig_col is 2, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 13, orig_col is 1, Text() is 'const'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 1, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is QUALIFIER, Text() is 'const'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 13, orig_col is 7, Text() is 'char'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 7, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is TYPE, Text() is 'char'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 13, orig_col is 11, Text() is '*'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 11, type is PTR_TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is PTR_TYPE, Text() is '*'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-brace_cleanup : orig_line is 13, orig_col is 13, Text() is 'const'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 13, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is QUALIFIER, Text() is 'const'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
-brace_cleanup : orig_line is 13, orig_col is 19, Text() is 'pTelName'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 19, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is WORD, Text() is 'pTelName'
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
-brace_cleanup : orig_line is 13, orig_col is 27, Text() is ';'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 13, orig_col is 27, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 13, type is SEMICOLON, Text() is ';'
-parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
-parse_cleanup : frm.stmt_count is 6, frm.expr_count is 6
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 13, orig_col is 28, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 14, orig_col is 1, Text() is 'unsigned'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 1, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is TYPE, Text() is 'unsigned'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-brace_cleanup : orig_line is 14, orig_col is 10, Text() is 'long'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 10, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is TYPE, Text() is 'long'
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-brace_cleanup : orig_line is 14, orig_col is 15, Text() is 'nTelIndex'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 15, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is WORD, Text() is 'nTelIndex'
-parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-brace_cleanup : orig_line is 14, orig_col is 24, Text() is ';'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 14, orig_col is 24, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 14, type is SEMICOLON, Text() is ';'
-parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
-parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 14, orig_col is 25, Text() is ''
-brace_cleanup : pp_level is 0
-brace_cleanup : orig_line is 15, orig_col is 1, Text() is '}'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 15, orig_col is 1, type is BRACE_CLOSE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
-parse_cleanup : orig_line is 15, type is BRACE_CLOSE, Text() is '}'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 15, orig_col is 2, Text() is ';'
-brace_cleanup : pp_level is 0
-parse_cleanup : orig_line is 15, orig_col is 2, type is SEMICOLON, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
-parse_cleanup : orig_line is 15, type is SEMICOLON, Text() is ';'
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
-parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
-brace_cleanup : orig_line is 15, orig_col is 3, Text() is ''
-brace_cleanup : pp_level is 0
-parameter_pack_cleanup : orig_line is 1, orig_col is 1, Text() is 'struct'
-parameter_pack_cleanup : orig_line is 1, orig_col is 8, Text() is 'TelegramIndex'
-parameter_pack_cleanup : orig_line is 1, orig_col is 21, Text() is ''
-parameter_pack_cleanup : orig_line is 2, orig_col is 1, Text() is '{'
-parameter_pack_cleanup : orig_line is 2, orig_col is 2, Text() is ''
-parameter_pack_cleanup : orig_line is 3, orig_col is 1, Text() is 'TelegramIndex'
-parameter_pack_cleanup : orig_line is 3, orig_col is 14, Text() is '('
-parameter_pack_cleanup : orig_line is 3, orig_col is 15, Text() is 'const'
-parameter_pack_cleanup : orig_line is 3, orig_col is 21, Text() is 'char'
-parameter_pack_cleanup : orig_line is 3, orig_col is 25, Text() is '*'
-parameter_pack_cleanup : orig_line is 3, orig_col is 27, Text() is 'pN'
-parameter_pack_cleanup : orig_line is 3, orig_col is 29, Text() is ','
-parameter_pack_cleanup : orig_line is 3, orig_col is 31, Text() is 'unsigned'
-parameter_pack_cleanup : orig_line is 3, orig_col is 40, Text() is 'long'
-parameter_pack_cleanup : orig_line is 3, orig_col is 45, Text() is 'nI'
-parameter_pack_cleanup : orig_line is 3, orig_col is 47, Text() is ')'
-parameter_pack_cleanup : orig_line is 3, orig_col is 49, Text() is ':'
-parameter_pack_cleanup : orig_line is 3, orig_col is 50, Text() is ''
-parameter_pack_cleanup : orig_line is 4, orig_col is 1, Text() is 'pTelName'
-parameter_pack_cleanup : orig_line is 4, orig_col is 9, Text() is '('
-parameter_pack_cleanup : orig_line is 4, orig_col is 10, Text() is 'pN'
-parameter_pack_cleanup : orig_line is 4, orig_col is 12, Text() is ')'
-parameter_pack_cleanup : orig_line is 4, orig_col is 13, Text() is ','
-parameter_pack_cleanup : orig_line is 4, orig_col is 14, Text() is ''
-parameter_pack_cleanup : orig_line is 5, orig_col is 1, Text() is 'nTelIndex'
-parameter_pack_cleanup : orig_line is 5, orig_col is 10, Text() is '('
-parameter_pack_cleanup : orig_line is 5, orig_col is 11, Text() is 'n'
-parameter_pack_cleanup : orig_line is 5, orig_col is 12, Text() is ')'
-parameter_pack_cleanup : orig_line is 5, orig_col is 13, Text() is ''
-parameter_pack_cleanup : orig_line is 6, orig_col is 1, Text() is '{'
-parameter_pack_cleanup : orig_line is 6, orig_col is 2, Text() is ''
-parameter_pack_cleanup : orig_line is 7, orig_col is 1, Text() is '}'
-parameter_pack_cleanup : orig_line is 7, orig_col is 2, Text() is ''
-parameter_pack_cleanup : orig_line is 9, orig_col is 1, Text() is '~'
-parameter_pack_cleanup : orig_line is 9, orig_col is 2, Text() is 'TelegramIndex'
-parameter_pack_cleanup : orig_line is 9, orig_col is 15, Text() is '('
-parameter_pack_cleanup : orig_line is 9, orig_col is 16, Text() is ')'
-parameter_pack_cleanup : orig_line is 9, orig_col is 17, Text() is ''
-parameter_pack_cleanup : orig_line is 10, orig_col is 1, Text() is '{'
-parameter_pack_cleanup : orig_line is 10, orig_col is 2, Text() is ''
-parameter_pack_cleanup : orig_line is 11, orig_col is 1, Text() is '}'
-parameter_pack_cleanup : orig_line is 11, orig_col is 2, Text() is ''
-parameter_pack_cleanup : orig_line is 13, orig_col is 1, Text() is 'const'
-parameter_pack_cleanup : orig_line is 13, orig_col is 7, Text() is 'char'
-parameter_pack_cleanup : orig_line is 13, orig_col is 11, Text() is '*'
-parameter_pack_cleanup : orig_line is 13, orig_col is 13, Text() is 'const'
-parameter_pack_cleanup : orig_line is 13, orig_col is 19, Text() is 'pTelName'
-parameter_pack_cleanup : orig_line is 13, orig_col is 27, Text() is ';'
-parameter_pack_cleanup : orig_line is 13, orig_col is 28, Text() is ''
-parameter_pack_cleanup : orig_line is 14, orig_col is 1, Text() is 'unsigned'
-parameter_pack_cleanup : orig_line is 14, orig_col is 10, Text() is 'long'
-parameter_pack_cleanup : orig_line is 14, orig_col is 15, Text() is 'nTelIndex'
-parameter_pack_cleanup : orig_line is 14, orig_col is 24, Text() is ';'
-parameter_pack_cleanup : orig_line is 14, orig_col is 25, Text() is ''
-parameter_pack_cleanup : orig_line is 15, orig_col is 1, Text() is '}'
-parameter_pack_cleanup : orig_line is 15, orig_col is 2, Text() is ';'
-parameter_pack_cleanup : orig_line is 15, orig_col is 3, Text() is ''
-log_rule(enum_cleanup : rule is 'mod_enum_last_comma'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/31.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/31.txt
deleted file mode 100644
index b683ad53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/31.txt
+++ /dev/null
@@ -1,876 +0,0 @@
-indent_text : orig_line is 1, orig_col is 1, for 'struct'
-indent_text : orig_line is 1, orig_col is 1, column is 1, for 'struct'
-   []
-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 : 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, for 'TelegramIndex'
-indent_text : orig_line is 1, orig_col is 8, column is 8, for 'TelegramIndex'
-   []
-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 : 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, for ''
-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 : 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, for '{'
-indent_text : orig_line is 2, orig_col is 1, column is 1, for '{'
-   []
-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 : 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
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 2, orig_col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
- [CallStack]
-indent_text : pc->orig_line is 2, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 2, orig_col is 2, for ''
-indent_text : orig_line is 2, <Newline>
-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 1, ...indent is 9
-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, for 'TelegramIndex'
-indent_text : orig_line is 3, orig_col is 1, column is 1, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 3, orig_col is 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
- [CallStack]
-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, for '('
-indent_text : orig_line is 3, orig_col is 14, column is 22, for '('
-   []
-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
-indent_text : frm.pse_tos is 2, ...indent is 23
-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, for 'const'
-indent_text : orig_line is 3, orig_col is 15, column is 23, for 'const'
-   []
-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, for 'char'
-indent_text : orig_line is 3, orig_col is 21, column is 29, for 'char'
-   []
-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, for '*'
-indent_text : orig_line is 3, orig_col is 25, column is 33, for '*'
-   []
-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, for 'pN'
-indent_text : orig_line is 3, orig_col is 27, column is 35, for 'pN'
-   []
-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, for ','
-indent_text : orig_line is 3, orig_col is 29, column is 37, for ','
-   []
-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, for 'unsigned'
-indent_text : orig_line is 3, orig_col is 31, column is 39, for 'unsigned'
-   []
-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, for 'long'
-indent_text : orig_line is 3, orig_col is 40, column is 48, for 'long'
-   []
-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, for 'nI'
-indent_text : orig_line is 3, orig_col is 45, column is 53, for 'nI'
-   []
-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, for ')'
-indent_text : orig_line is 3, orig_col is 47, column is 55, for ')'
-   []
-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 : 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, for ':'
-indent_text : orig_line is 3, orig_col is 49, column is 57, for ':'
-   []
-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
-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 : orig_line is 3, orig_col is 50, for ''
-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 : 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, for 'pTelName'
-indent_text : orig_line is 4, orig_col is 1, column is 1, for 'pTelName'
-   []
-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 : 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, for '('
-indent_text : orig_line is 4, orig_col is 9, column is 25, for '('
-   []
-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 : 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
-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, for 'pN'
-indent_text : orig_line is 4, orig_col is 10, column is 26, for 'pN'
-   []
-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, for ')'
-indent_text : orig_line is 4, orig_col is 12, column is 28, for ')'
-   []
-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 : 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, for ','
-indent_text : orig_line is 4, orig_col is 13, column is 29, for ','
-   []
-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 : 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, for ''
-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 : 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, for 'nTelIndex'
-indent_text : orig_line is 5, orig_col is 1, column is 1, for 'nTelIndex'
-   []
-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 : 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, for '('
-indent_text : orig_line is 5, orig_col is 10, column is 26, for '('
-   []
-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 : 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
-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, for 'n'
-indent_text : orig_line is 5, orig_col is 11, column is 27, for 'n'
-   []
-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, for ')'
-indent_text : orig_line is 5, orig_col is 12, column is 28, for ')'
-   []
-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 : 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, for ''
-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 : 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, for '{'
-indent_text : orig_line is 6, orig_col is 1, column is 1, for '{'
-   []
-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 : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ... indent is 17
-indent_text : orig_line is 6, orig_col is 1, Text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 6, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : pc->orig_line is 6, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 6, orig_col is 2, for ''
-indent_text : orig_line is 6, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-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 7, orig_col is 1, Text() is '}', type is BRACE_CLOSE
-indent_text : orig_line is 7, orig_col is 1, for '}'
-indent_text : orig_line is 7, orig_col is 1, column is 1, for '}'
-   []
-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 : 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
- [CallStack]
-indent_text : pc->orig_line is 7, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 7, orig_col is 2, for ''
-indent_text : orig_line is 7, <Newline>
-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 1, ...indent is 9
-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, for '~'
-indent_text : orig_line is 9, orig_col is 1, column is 1, for '~'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 9, orig_col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
- [CallStack]
-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, for 'TelegramIndex'
-indent_text : orig_line is 9, orig_col is 2, column is 10, for 'TelegramIndex'
-   []
-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, for '('
-indent_text : orig_line is 9, orig_col is 15, column is 23, for '('
-   []
-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
-indent_text : frm.pse_tos is 2, ...indent is 24
-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, for ')'
-indent_text : orig_line is 9, orig_col is 16, column is 24, for ')'
-   []
-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 : 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
-indent_text : orig_line is 9, orig_col is 17, for ''
-indent_text : orig_line is 9, <Newline>
-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 1, ...indent is 9
-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, for '{'
-indent_text : orig_line is 10, orig_col is 1, column is 1, for '{'
-   []
-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
-indent_text : orig_line is 10, orig_col is 1, Text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 10, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : pc->orig_line is 10, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 10, orig_col is 2, for ''
-indent_text : orig_line is 10, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-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 11, orig_col is 1, Text() is '}', type is BRACE_CLOSE
-indent_text : orig_line is 11, orig_col is 1, for '}'
-indent_text : orig_line is 11, orig_col is 1, column is 1, for '}'
-   []
-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 : 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
- [CallStack]
-indent_text : pc->orig_line is 11, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 11, orig_col is 2, for ''
-indent_text : orig_line is 11, <Newline>
-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 1, ...indent is 9
-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, for 'const'
-indent_text : orig_line is 13, orig_col is 1, column is 1, for 'const'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 13, orig_col is 1, on 'const' [QUALIFIER/NONE] => 9
- [CallStack]
-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, for 'char'
-indent_text : orig_line is 13, orig_col is 7, column is 15, for 'char'
-   []
-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, for '*'
-indent_text : orig_line is 13, orig_col is 11, column is 19, for '*'
-   []
-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, for 'const'
-indent_text : orig_line is 13, orig_col is 13, column is 21, for 'const'
-   []
-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, for 'pTelName'
-indent_text : orig_line is 13, orig_col is 19, column is 27, for 'pTelName'
-   []
-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, for ';'
-indent_text : orig_line is 13, orig_col is 27, column is 35, for ';'
-   []
-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
-indent_text : orig_line is 13, orig_col is 28, for ''
-indent_text : orig_line is 13, <Newline>
-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 1, ...indent is 9
-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, for 'unsigned'
-indent_text : orig_line is 14, orig_col is 1, column is 1, for 'unsigned'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 14, orig_col is 1, on 'unsigned' [TYPE/NONE] => 9
- [CallStack]
-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, for 'long'
-indent_text : orig_line is 14, orig_col is 10, column is 18, for 'long'
-   []
-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, for 'nTelIndex'
-indent_text : orig_line is 14, orig_col is 15, column is 23, for 'nTelIndex'
-   []
-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, for ';'
-indent_text : orig_line is 14, orig_col is 24, column is 32, for ';'
-   []
-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
-indent_text : orig_line is 14, orig_col is 25, for ''
-indent_text : orig_line is 14, <Newline>
-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 1, ...indent is 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, for '}'
-indent_text : orig_line is 15, orig_col is 1, column is 1, for '}'
-   []
-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 : 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
- [CallStack]
-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, for ';'
-indent_text : orig_line is 15, orig_col is 2, column is 2, for ';'
-   []
-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 : 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, for ''
-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 : 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
-indent_text : after quick_align_again
-indent_text : orig_line is 1, orig_col is 1, for 'struct'
-indent_text : orig_line is 1, orig_col is 1, column is 1, for 'struct'
-   []
-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 : 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, for 'TelegramIndex'
-indent_text : orig_line is 1, orig_col is 8, column is 8, for 'TelegramIndex'
-   []
-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 : 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, for ''
-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 : 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, for '{'
-indent_text : orig_line is 2, orig_col is 1, column is 1, for '{'
-   []
-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 : 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
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 2, orig_col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
- [CallStack]
-indent_text : pc->orig_line is 2, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 2, orig_col is 2, for ''
-indent_text : orig_line is 2, <Newline>
-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 1, ...indent is 9
-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, for 'TelegramIndex'
-indent_text : orig_line is 3, orig_col is 1, column is 9, for 'TelegramIndex'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 3, orig_col is 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
- [CallStack]
-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, for '('
-indent_text : orig_line is 3, orig_col is 14, column is 22, for '('
-   []
-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
-indent_text : frm.pse_tos is 2, ...indent is 23
-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, for 'const'
-indent_text : orig_line is 3, orig_col is 15, column is 23, for 'const'
-   []
-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, for 'char'
-indent_text : orig_line is 3, orig_col is 21, column is 29, for 'char'
-   []
-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, for '*'
-indent_text : orig_line is 3, orig_col is 25, column is 33, for '*'
-   []
-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, for 'pN'
-indent_text : orig_line is 3, orig_col is 27, column is 35, for 'pN'
-   []
-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, for ','
-indent_text : orig_line is 3, orig_col is 29, column is 37, for ','
-   []
-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, for 'unsigned'
-indent_text : orig_line is 3, orig_col is 31, column is 39, for 'unsigned'
-   []
-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, for 'long'
-indent_text : orig_line is 3, orig_col is 40, column is 48, for 'long'
-   []
-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, for 'nI'
-indent_text : orig_line is 3, orig_col is 45, column is 53, for 'nI'
-   []
-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, for ')'
-indent_text : orig_line is 3, orig_col is 47, column is 55, for ')'
-   []
-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 : 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, for ':'
-indent_text : orig_line is 3, orig_col is 49, column is 57, for ':'
-   []
-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
-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 : orig_line is 3, orig_col is 50, for ''
-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 : 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, for 'pTelName'
-indent_text : orig_line is 4, orig_col is 1, column is 17, for 'pTelName'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : 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, for '('
-indent_text : orig_line is 4, orig_col is 9, column is 25, for '('
-   []
-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 : 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
-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, for 'pN'
-indent_text : orig_line is 4, orig_col is 10, column is 26, for 'pN'
-   []
-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, for ')'
-indent_text : orig_line is 4, orig_col is 12, column is 28, for ')'
-   []
-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 : 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, for ','
-indent_text : orig_line is 4, orig_col is 13, column is 29, for ','
-   []
-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 : 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, for ''
-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 : 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, for 'nTelIndex'
-indent_text : orig_line is 5, orig_col is 1, column is 17, for 'nTelIndex'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : 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, for '('
-indent_text : orig_line is 5, orig_col is 10, column is 26, for '('
-   []
-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 : 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
-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, for 'n'
-indent_text : orig_line is 5, orig_col is 11, column is 27, for 'n'
-   []
-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, for ')'
-indent_text : orig_line is 5, orig_col is 12, column is 28, for ')'
-   []
-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 : 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, for ''
-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 : 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, for '{'
-indent_text : orig_line is 6, orig_col is 1, column is 9, for '{'
-   []
-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 : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ... indent is 17
-indent_text : orig_line is 6, orig_col is 1, Text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 6, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : pc->orig_line is 6, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 6, orig_col is 2, for ''
-indent_text : orig_line is 6, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-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 7, orig_col is 1, Text() is '}', type is BRACE_CLOSE
-indent_text : orig_line is 7, orig_col is 1, for '}'
-indent_text : orig_line is 7, orig_col is 1, column is 9, for '}'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : 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
- [CallStack]
-indent_text : pc->orig_line is 7, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 7, orig_col is 2, for ''
-indent_text : orig_line is 7, <Newline>
-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 1, ...indent is 9
-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, for '~'
-indent_text : orig_line is 9, orig_col is 1, column is 9, for '~'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 9, orig_col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
- [CallStack]
-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, for 'TelegramIndex'
-indent_text : orig_line is 9, orig_col is 2, column is 10, for 'TelegramIndex'
-   []
-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, for '('
-indent_text : orig_line is 9, orig_col is 15, column is 23, for '('
-   []
-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
-indent_text : frm.pse_tos is 2, ...indent is 24
-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, for ')'
-indent_text : orig_line is 9, orig_col is 16, column is 24, for ')'
-   []
-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 : 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
-indent_text : orig_line is 9, orig_col is 17, for ''
-indent_text : orig_line is 9, <Newline>
-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 1, ...indent is 9
-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, for '{'
-indent_text : orig_line is 10, orig_col is 1, column is 9, for '{'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 2, ... indent is 17
-indent_text : orig_line is 10, orig_col is 1, Text() is '{', parent_type is FUNC_CLASS_DEF
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 10, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
- [CallStack]
-indent_text : pc->orig_line is 10, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 10, orig_col is 2, for ''
-indent_text : orig_line is 10, <Newline>
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-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 11, orig_col is 1, Text() is '}', type is BRACE_CLOSE
-indent_text : orig_line is 11, orig_col is 1, for '}'
-indent_text : orig_line is 11, orig_col is 1, column is 9, for '}'
-   []
-indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : 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
- [CallStack]
-indent_text : pc->orig_line is 11, orig_col is 2, Text() is '', type is NEWLINE
-indent_text : orig_line is 11, orig_col is 2, for ''
-indent_text : orig_line is 11, <Newline>
-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 1, ...indent is 9
-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, for 'const'
-indent_text : orig_line is 13, orig_col is 1, column is 9, for 'const'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 13, orig_col is 1, on 'const' [QUALIFIER/NONE] => 9
- [CallStack]
-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, for 'char'
-indent_text : orig_line is 13, orig_col is 7, column is 15, for 'char'
-   []
-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, for '*'
-indent_text : orig_line is 13, orig_col is 11, column is 19, for '*'
-   []
-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, for 'const'
-indent_text : orig_line is 13, orig_col is 13, column is 21, for 'const'
-   []
-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, for 'pTelName'
-indent_text : orig_line is 13, orig_col is 19, column is 27, for 'pTelName'
-   []
-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, for ';'
-indent_text : orig_line is 13, orig_col is 27, column is 35, for ';'
-   []
-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
-indent_text : orig_line is 13, orig_col is 28, for ''
-indent_text : orig_line is 13, <Newline>
-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 1, ...indent is 9
-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, for 'unsigned'
-indent_text : orig_line is 14, orig_col is 1, column is 9, for 'unsigned'
-   []
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 14, orig_col is 1, on 'unsigned' [TYPE/NONE] => 9
- [CallStack]
-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, for 'long'
-indent_text : orig_line is 14, orig_col is 10, column is 18, for 'long'
-   []
-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, for 'nTelIndex'
-indent_text : orig_line is 14, orig_col is 15, column is 23, for 'nTelIndex'
-   []
-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, for ';'
-indent_text : orig_line is 14, orig_col is 24, column is 32, for ';'
-   []
-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
-indent_text : orig_line is 14, orig_col is 25, for ''
-indent_text : orig_line is 14, <Newline>
-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 1, ...indent is 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, for '}'
-indent_text : orig_line is 15, orig_col is 1, column is 1, for '}'
-   []
-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 : 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
- [CallStack]
-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, for ';'
-indent_text : orig_line is 15, orig_col is 2, column is 2, for ';'
-   []
-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 : 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, for ''
-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 : 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
-indent_text : after quick_align_again
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/36.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/36.txt
deleted file mode 100644
index 5eed370e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/36.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-fix_fcn_def_params : Text() '(', type is PAREN_OPEN, on orig_line 3, level is 1
-fix_fcn_def_params : looking at, Text() 'const' on orig_line 3, level 2
-fix_fcn_def_params : looking at, Text() 'char' on orig_line 3, level 2
-fix_fcn_def_params : looking at, Text() '*' on orig_line 3, level 2
-fix_fcn_def_params : looking at, Text() 'pN' on orig_line 3, level 2
-fix_fcn_def_params : looking at, Text() ',' on orig_line 3, level 2
-mark_variable_stack : parameter on orig_line 3, orig_col 27:
-mark_variable_stack : parameter on orig_line 3, orig_col 27: <char> as TYPE
-mark_variable_stack : parameter on orig_line 3, orig_col 27: <pN> as VAR
-fix_fcn_def_params : looking at, Text() 'unsigned' on orig_line 3, level 2
-fix_fcn_def_params : looking at, Text() 'long' on orig_line 3, level 2
-fix_fcn_def_params : looking at, Text() 'nI' on orig_line 3, level 2
-fix_fcn_def_params : bailed on Text() ')', on orig_line 3
-mark_variable_stack : parameter on orig_line 3, orig_col 45:
-mark_variable_stack : parameter on orig_line 3, orig_col 45: <long> as TYPE
-mark_variable_stack : parameter on orig_line 3, orig_col 45: <unsigned> as TYPE
-mark_variable_stack : parameter on orig_line 3, orig_col 45: <nI> as VAR
-fix_fcn_def_params : Text() '(', type is PAREN_OPEN, on orig_line 9, level is 1
-fix_fcn_def_params : bailed on Text() ')', on orig_line 9
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/66.txt
deleted file mode 100644
index 85cdb21a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/66.txt
+++ /dev/null
@@ -1,741 +0,0 @@
-space_text : orig_line is 1, orig_col is 1, 'struct' type is STRUCT
-space_text : back-to-back words need a space: pc->Text() 'struct', next->Text() 'TelegramIndex'
-space_text : orig_line is 1, orig_col is 1, pc-Text() 'struct', type is STRUCT
-do_space : orig_line is 1, orig_col is 1, first->Text() 'struct', type is STRUCT
-do_space : first->orig_line is 1, first->orig_col is 1, first->Text() is 'struct', [STRUCT/NONE] <===>
-           second->orig_line is 1, second->orig_col is 8, second->Text() is 'TelegramIndex', [TYPE/STRUCT] : rule ADD from add_space_table[ ]
-ensure_force_space : <force between 'struct' and 'TelegramIndex'> rule = ADD @ 1 => 8
-space_text : orig_line is 1, orig_col is 8, 'TelegramIndex' type is TYPE
-space_text : orig_line is 1, orig_col is 8, pc-Text() 'TelegramIndex', type is TYPE
-do_space : orig_line is 1, orig_col is 8, first->Text() 'TelegramIndex', type is TYPE
- rule = REMOVE @ 0 => 21
-space_text : orig_line is 1, orig_col is 21, <Newline>, nl is 1
-space_text : orig_line is 2, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 2, orig_col is 1, pc-Text() '{', type is BRACE_OPEN
-do_space : orig_line is 2, orig_col is 1, first->Text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 2, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 3, orig_col is 1, 'TelegramIndex' type is FUNC_CLASS_DEF
-space_text : orig_line is 3, orig_col is 1, pc-Text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : orig_line is 3, orig_col is 1, first->Text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 3, first->orig_col is 1, first->Text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
-           second->orig_line is 3, second->orig_col is 14, second->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
- rule = IGNORE @ 0 => 14
-space_text : orig_line is 3, orig_col is 14, '(' type is FPAREN_OPEN
-space_text : orig_line is 3, orig_col is 14, pc-Text() '(', type is FPAREN_OPEN
-do_space : orig_line is 3, orig_col is 14, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 3, first->orig_col is 14, first->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 15, second->Text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 15
-space_text : orig_line is 3, orig_col is 15, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->Text() 'const', next->Text() 'char'
-space_text : orig_line is 3, orig_col is 15, pc-Text() 'const', type is QUALIFIER
-do_space : orig_line is 3, orig_col is 15, first->Text() 'const', type is QUALIFIER
-do_space : first->orig_line is 3, first->orig_col is 15, first->Text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 3, second->orig_col is 21, second->Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'> rule = FORCE @ 1 => 21
-space_text : orig_line is 3, orig_col is 21, 'char' type is TYPE
-space_text : orig_line is 3, orig_col is 21, pc-Text() 'char', type is TYPE
-do_space : orig_line is 3, orig_col is 21, first->Text() 'char', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 21, first->Text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 25, second->Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 0 => 25
-space_text : orig_line is 3, orig_col is 25, '*' type is PTR_TYPE
-space_text : orig_line is 3, orig_col is 25, pc-Text() '*', type is PTR_TYPE
-do_space : orig_line is 3, orig_col is 25, first->Text() '*', type is PTR_TYPE
-do_space : first->orig_line is 3, first->orig_col is 25, first->Text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 27, second->Text() is 'pN', [WORD/NONE] : rule sp_after_ptr_star[ ]
- rule = IGNORE @ 1 => 27
-space_text : orig_line is 3, orig_col is 27, 'pN' type is WORD
-space_text : orig_line is 3, orig_col is 27, pc-Text() 'pN', type is WORD
-do_space : orig_line is 3, orig_col is 27, first->Text() 'pN', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 27, first->Text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 29, second->Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
- rule = REMOVE @ 0 => 29
-space_text : orig_line is 3, orig_col is 29, ',' type is COMMA
-space_text : orig_line is 3, orig_col is 29, pc-Text() ',', type is COMMA
-do_space : orig_line is 3, orig_col is 29, first->Text() ',', type is COMMA
-do_space : first->orig_line is 3, first->orig_col is 29, first->Text() is ',', [COMMA/NONE] <===>
-           second->orig_line is 3, second->orig_col is 31, second->Text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
- rule = IGNORE @ 1 => 31
-space_text : orig_line is 3, orig_col is 31, 'unsigned' type is TYPE
-space_text : back-to-back words need a space: pc->Text() 'unsigned', next->Text() 'long'
-space_text : orig_line is 3, orig_col is 31, pc-Text() 'unsigned', type is TYPE
-do_space : orig_line is 3, orig_col is 31, first->Text() 'unsigned', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 31, first->Text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 40, second->Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 40
-space_text : orig_line is 3, orig_col is 40, 'long' type is TYPE
-space_text : back-to-back words need a space: pc->Text() 'long', next->Text() 'nI'
-space_text : orig_line is 3, orig_col is 40, pc-Text() 'long', type is TYPE
-do_space : orig_line is 3, orig_col is 40, first->Text() 'long', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 40, first->Text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 45, second->Text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nI'> rule = FORCE @ 1 => 45
-space_text : orig_line is 3, orig_col is 45, 'nI' type is WORD
-space_text : orig_line is 3, orig_col is 45, pc-Text() 'nI', type is WORD
-do_space : orig_line is 3, orig_col is 45, first->Text() 'nI', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 45, first->Text() is 'nI', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 47, second->Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 47
-space_text : orig_line is 3, orig_col is 47, ')' type is FPAREN_CLOSE
-space_text : orig_line is 3, orig_col is 47, pc-Text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 3, orig_col is 47, first->Text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 3, first->orig_col is 47, first->Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 49, second->Text() is ':', [CONSTR_COLON/NONE] : rule sp_before_constr_colon[ ]
- rule = ADD @ 1 => 49
-space_text : orig_line is 3, orig_col is 49, ':' type is CONSTR_COLON
-space_text : orig_line is 3, orig_col is 49, pc-Text() ':', type is CONSTR_COLON
-do_space : orig_line is 3, orig_col is 49, first->Text() ':', type is CONSTR_COLON
- rule = REMOVE @ 0 => 50
-space_text : orig_line is 3, orig_col is 50, <Newline>, nl is 1
-space_text : orig_line is 4, orig_col is 1, 'pTelName' type is FUNC_CTOR_VAR
-space_text : orig_line is 4, orig_col is 1, pc-Text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : orig_line is 4, orig_col is 1, first->Text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 4, first->orig_col is 1, first->Text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 4, second->orig_col is 9, second->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
- rule = IGNORE @ 0 => 9
-space_text : orig_line is 4, orig_col is 9, '(' type is FPAREN_OPEN
-space_text : orig_line is 4, orig_col is 9, pc-Text() '(', type is FPAREN_OPEN
-do_space : orig_line is 4, orig_col is 9, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 4, first->orig_col is 9, first->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 10, second->Text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 10
-space_text : orig_line is 4, orig_col is 10, 'pN' type is WORD
-space_text : orig_line is 4, orig_col is 10, pc-Text() 'pN', type is WORD
-do_space : orig_line is 4, orig_col is 10, first->Text() 'pN', type is WORD
-do_space : first->orig_line is 4, first->orig_col is 10, first->Text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 4, second->orig_col is 12, second->Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 12
-space_text : orig_line is 4, orig_col is 12, ')' type is FPAREN_CLOSE
-space_text : orig_line is 4, orig_col is 12, pc-Text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 4, orig_col is 12, first->Text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 4, first->orig_col is 12, first->Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 13, second->Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
- rule = REMOVE @ 0 => 13
-space_text : orig_line is 4, orig_col is 13, ',' type is COMMA
-space_text : orig_line is 4, orig_col is 13, pc-Text() ',', type is COMMA
-do_space : orig_line is 4, orig_col is 13, first->Text() ',', type is COMMA
- rule = REMOVE @ 0 => 14
-space_text : orig_line is 4, orig_col is 14, <Newline>, nl is 1
-space_text : orig_line is 5, orig_col is 1, 'nTelIndex' type is FUNC_CTOR_VAR
-space_text : orig_line is 5, orig_col is 1, pc-Text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : orig_line is 5, orig_col is 1, first->Text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 5, first->orig_col is 1, first->Text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 5, second->orig_col is 10, second->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
- rule = IGNORE @ 0 => 10
-space_text : orig_line is 5, orig_col is 10, '(' type is FPAREN_OPEN
-space_text : orig_line is 5, orig_col is 10, pc-Text() '(', type is FPAREN_OPEN
-do_space : orig_line is 5, orig_col is 10, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 5, first->orig_col is 10, first->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 5, second->orig_col is 11, second->Text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 11
-space_text : orig_line is 5, orig_col is 11, 'n' type is WORD
-space_text : orig_line is 5, orig_col is 11, pc-Text() 'n', type is WORD
-do_space : orig_line is 5, orig_col is 11, first->Text() 'n', type is WORD
-do_space : first->orig_line is 5, first->orig_col is 11, first->Text() is 'n', [WORD/NONE] <===>
-           second->orig_line is 5, second->orig_col is 12, second->Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 12
-space_text : orig_line is 5, orig_col is 12, ')' type is FPAREN_CLOSE
-space_text : orig_line is 5, orig_col is 12, pc-Text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 5, orig_col is 12, first->Text() ')', type is FPAREN_CLOSE
- rule = REMOVE @ 0 => 13
-space_text : orig_line is 5, orig_col is 13, <Newline>, nl is 1
-space_text : orig_line is 6, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 6, orig_col is 1, pc-Text() '{', type is BRACE_OPEN
-do_space : orig_line is 6, orig_col is 1, first->Text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 6, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 7, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 7, orig_col is 1, pc-Text() '}', type is BRACE_CLOSE
-do_space : orig_line is 7, orig_col is 1, first->Text() '}', type is BRACE_CLOSE
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 7, orig_col is 2, <Newline>, nl is 2
-space_text : orig_line is 9, orig_col is 1, '~' type is DESTRUCTOR
-space_text : orig_line is 9, orig_col is 1, pc-Text() '~', type is DESTRUCTOR
-do_space : orig_line is 9, orig_col is 1, first->Text() '~', type is DESTRUCTOR
-do_space : first->orig_line is 9, first->orig_col is 1, first->Text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 2, second->Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 9, orig_col is 2, 'TelegramIndex' type is FUNC_CLASS_DEF
-space_text : orig_line is 9, orig_col is 2, pc-Text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : orig_line is 9, orig_col is 2, first->Text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 9, first->orig_col is 2, first->Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
-           second->orig_line is 9, second->orig_col is 15, second->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
- rule = IGNORE @ 0 => 15
-space_text : orig_line is 9, orig_col is 15, '(' type is FPAREN_OPEN
-space_text : orig_line is 9, orig_col is 15, pc-Text() '(', type is FPAREN_OPEN
-do_space : orig_line is 9, orig_col is 15, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 9, first->orig_col is 15, first->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 16, second->Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
- rule = IGNORE @ 0 => 16
-space_text : orig_line is 9, orig_col is 16, ')' type is FPAREN_CLOSE
-space_text : orig_line is 9, orig_col is 16, pc-Text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 9, orig_col is 16, first->Text() ')', type is FPAREN_CLOSE
- rule = REMOVE @ 0 => 17
-space_text : orig_line is 9, orig_col is 17, <Newline>, nl is 1
-space_text : orig_line is 10, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 10, orig_col is 1, pc-Text() '{', type is BRACE_OPEN
-do_space : orig_line is 10, orig_col is 1, first->Text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 10, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 11, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 11, orig_col is 1, pc-Text() '}', type is BRACE_CLOSE
-do_space : orig_line is 11, orig_col is 1, first->Text() '}', type is BRACE_CLOSE
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 11, orig_col is 2, <Newline>, nl is 2
-space_text : orig_line is 13, orig_col is 1, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->Text() 'const', next->Text() 'char'
-space_text : orig_line is 13, orig_col is 1, pc-Text() 'const', type is QUALIFIER
-do_space : orig_line is 13, orig_col is 1, first->Text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 1, first->Text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 7, second->Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'> rule = FORCE @ 1 => 7
-space_text : orig_line is 13, orig_col is 7, 'char' type is TYPE
-space_text : orig_line is 13, orig_col is 7, pc-Text() 'char', type is TYPE
-do_space : orig_line is 13, orig_col is 7, first->Text() 'char', type is TYPE
-do_space : first->orig_line is 13, first->orig_col is 7, first->Text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 11, second->Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 0 => 11
-space_text : orig_line is 13, orig_col is 11, '*' type is PTR_TYPE
-space_text : orig_line is 13, orig_col is 11, pc-Text() '*', type is PTR_TYPE
-do_space : orig_line is 13, orig_col is 11, first->Text() '*', type is PTR_TYPE
-do_space : first->orig_line is 13, first->orig_col is 11, first->Text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 13, second->Text() is 'const', [QUALIFIER/NONE] : rule sp_after_ptr_star_qualifier[ ]
- rule = IGNORE @ 1 => 13
-space_text : orig_line is 13, orig_col is 13, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->Text() 'const', next->Text() 'pTelName'
-space_text : orig_line is 13, orig_col is 13, pc-Text() 'const', type is QUALIFIER
-do_space : orig_line is 13, orig_col is 13, first->Text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 13, first->Text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 19, second->Text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'pTelName'> rule = FORCE @ 1 => 19
-space_text : orig_line is 13, orig_col is 19, 'pTelName' type is WORD
-space_text : orig_line is 13, orig_col is 19, pc-Text() 'pTelName', type is WORD
-do_space : orig_line is 13, orig_col is 19, first->Text() 'pTelName', type is WORD
-do_space : first->orig_line is 13, first->orig_col is 19, first->Text() is 'pTelName', [WORD/NONE] <===>
-           second->orig_line is 13, second->orig_col is 27, second->Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 27
-space_text : orig_line is 13, orig_col is 27, ';' type is SEMICOLON
-space_text : orig_line is 13, orig_col is 27, pc-Text() ';', type is SEMICOLON
-do_space : orig_line is 13, orig_col is 27, first->Text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 28
-space_text : orig_line is 13, orig_col is 28, <Newline>, nl is 1
-space_text : orig_line is 14, orig_col is 1, 'unsigned' type is TYPE
-space_text : back-to-back words need a space: pc->Text() 'unsigned', next->Text() 'long'
-space_text : orig_line is 14, orig_col is 1, pc-Text() 'unsigned', type is TYPE
-do_space : orig_line is 14, orig_col is 1, first->Text() 'unsigned', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 1, first->Text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 10, second->Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 10
-space_text : orig_line is 14, orig_col is 10, 'long' type is TYPE
-space_text : back-to-back words need a space: pc->Text() 'long', next->Text() 'nTelIndex'
-space_text : orig_line is 14, orig_col is 10, pc-Text() 'long', type is TYPE
-do_space : orig_line is 14, orig_col is 10, first->Text() 'long', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 10, first->Text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 15, second->Text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nTelIndex'> rule = FORCE @ 1 => 15
-space_text : orig_line is 14, orig_col is 15, 'nTelIndex' type is WORD
-space_text : orig_line is 14, orig_col is 15, pc-Text() 'nTelIndex', type is WORD
-do_space : orig_line is 14, orig_col is 15, first->Text() 'nTelIndex', type is WORD
-do_space : first->orig_line is 14, first->orig_col is 15, first->Text() is 'nTelIndex', [WORD/NONE] <===>
-           second->orig_line is 14, second->orig_col is 24, second->Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 24
-space_text : orig_line is 14, orig_col is 24, ';' type is SEMICOLON
-space_text : orig_line is 14, orig_col is 24, pc-Text() ';', type is SEMICOLON
-do_space : orig_line is 14, orig_col is 24, first->Text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 25
-space_text : orig_line is 14, orig_col is 25, <Newline>, nl is 1
-space_text : orig_line is 15, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 15, orig_col is 1, pc-Text() '}', type is BRACE_CLOSE
-do_space : orig_line is 15, orig_col is 1, first->Text() '}', type is BRACE_CLOSE
-do_space : first->orig_line is 15, first->orig_col is 1, first->Text() is '}', [BRACE_CLOSE/STRUCT] <===>
-           second->orig_line is 15, second->orig_col is 2, second->Text() is ';', [SEMICOLON/STRUCT] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 15, orig_col is 2, ';' type is SEMICOLON
-space_text : orig_line is 15, orig_col is 2, pc-Text() ';', type is SEMICOLON
-do_space : orig_line is 15, orig_col is 2, first->Text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 3
-space_text : orig_line is 15, orig_col is 3, <Newline>, nl is 2
-space_col_align : first->orig_line is 3, orig_col is 1, [FUNC_CLASS_DEF/NONE], Text() 'TelegramIndex' <==>
-space_col_align : second->orig_line is 3, orig_col is 14 [FPAREN_OPEN/FUNC_CLASS_DEF], Text() '(', [CallStack]
-do_space : orig_line is 3, orig_col is 1, first->Text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 3, first->orig_col is 1, first->Text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
-           second->orig_line is 3, second->orig_col is 14, second->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 13
-space_col_align :    => coldiff is 13
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->Text()     is 'TelegramIndex'
-space_col_align :    => second->Text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 14
-space_col_align :    => first->Len()      is 13
-space_col_align :    => coldiff is 13
-space_col_align : first->orig_line is 3, orig_col is 14, [FPAREN_OPEN/FUNC_CLASS_DEF], Text() '(' <==>
-space_col_align : second->orig_line is 3, orig_col is 15 [QUALIFIER/NONE], Text() 'const', [CallStack]
-do_space : orig_line is 3, orig_col is 14, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 3, first->orig_col is 14, first->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 15, second->Text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->Text()     is '('
-space_col_align :    => second->Text()    is 'const'
-space_col_align :    => first->orig_col   is 14
-space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 3, orig_col is 15, [QUALIFIER/NONE], Text() 'const' <==>
-space_col_align : second->orig_line is 3, orig_col is 21 [TYPE/NONE], Text() 'char', [CallStack]
-do_space : orig_line is 3, orig_col is 15, first->Text() 'const', type is QUALIFIER
-do_space : first->orig_line is 3, first->orig_col is 15, first->Text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 3, second->orig_col is 21, second->Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>space_col_align : av is force
-space_col_align :    Len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-space_col_align : first->orig_line is 3, orig_col is 21, [TYPE/NONE], Text() 'char' <==>
-space_col_align : second->orig_line is 3, orig_col is 25 [PTR_TYPE/NONE], Text() '*', [CallStack]
-do_space : orig_line is 3, orig_col is 21, first->Text() 'char', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 21, first->Text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 25, second->Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->Text()     is 'char'
-space_col_align :    => second->Text()    is '*'
-space_col_align :    => first->orig_col   is 21
-space_col_align :    => second->orig_col  is 25
-space_col_align :    => first->Len()      is 4
-space_col_align :    => coldiff is 4
-space_col_align : first->orig_line is 3, orig_col is 25, [PTR_TYPE/NONE], Text() '*' <==>
-space_col_align : second->orig_line is 3, orig_col is 27 [WORD/NONE], Text() 'pN', [CallStack]
-do_space : orig_line is 3, orig_col is 25, first->Text() '*', type is PTR_TYPE
-do_space : first->orig_line is 3, first->orig_col is 25, first->Text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 27, second->Text() is 'pN', [WORD/NONE] : rule sp_after_ptr_star[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->Text()     is '*'
-space_col_align :    => second->Text()    is 'pN'
-space_col_align :    => first->orig_col   is 25
-space_col_align :    => second->orig_col  is 27
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 27, [WORD/NONE], Text() 'pN' <==>
-space_col_align : second->orig_line is 3, orig_col is 29 [COMMA/NONE], Text() ',', [CallStack]
-do_space : orig_line is 3, orig_col is 27, first->Text() 'pN', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 27, first->Text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 29, second->Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
-space_col_align : av is remove
-space_col_align :    Len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 29, [COMMA/NONE], Text() ',' <==>
-space_col_align : second->orig_line is 3, orig_col is 31 [TYPE/NONE], Text() 'unsigned', [CallStack]
-do_space : orig_line is 3, orig_col is 29, first->Text() ',', type is COMMA
-do_space : first->orig_line is 3, first->orig_col is 29, first->Text() is ',', [COMMA/NONE] <===>
-           second->orig_line is 3, second->orig_col is 31, second->Text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->Text()     is ','
-space_col_align :    => second->Text()    is 'unsigned'
-space_col_align :    => first->orig_col   is 29
-space_col_align :    => second->orig_col  is 31
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 31, [TYPE/NONE], Text() 'unsigned' <==>
-space_col_align : second->orig_line is 3, orig_col is 40 [TYPE/NONE], Text() 'long', [CallStack]
-do_space : orig_line is 3, orig_col is 31, first->Text() 'unsigned', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 31, first->Text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 40, second->Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>space_col_align : av is force
-space_col_align :    Len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 3, orig_col is 40, [TYPE/NONE], Text() 'long' <==>
-space_col_align : second->orig_line is 3, orig_col is 45 [WORD/NONE], Text() 'nI', [CallStack]
-do_space : orig_line is 3, orig_col is 40, first->Text() 'long', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 40, first->Text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 3, second->orig_col is 45, second->Text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nI'>space_col_align : av is force
-space_col_align :    Len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 5
-space_col_align : first->orig_line is 3, orig_col is 45, [WORD/NONE], Text() 'nI' <==>
-space_col_align : second->orig_line is 3, orig_col is 47 [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')', [CallStack]
-do_space : orig_line is 3, orig_col is 45, first->Text() 'nI', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 45, first->Text() is 'nI', [WORD/NONE] <===>
-           second->orig_line is 3, second->orig_col is 47, second->Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->Text()     is 'nI'
-space_col_align :    => second->Text()    is ')'
-space_col_align :    => first->orig_col   is 45
-space_col_align :    => second->orig_col  is 47
-space_col_align :    => first->Len()      is 2
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')' <==>
-space_col_align : second->orig_line is 3, orig_col is 49 [CONSTR_COLON/NONE], Text() ':', [CallStack]
-do_space : orig_line is 3, orig_col is 47, first->Text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 3, first->orig_col is 47, first->Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
-           second->orig_line is 3, second->orig_col is 49, second->Text() is ':', [CONSTR_COLON/NONE] : rule sp_before_constr_colon[ ]
-space_col_align : av is add
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is ADD
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 49, [CONSTR_COLON/NONE], Text() ':' <==>
-space_col_align : second->orig_line is 3, orig_col is 50 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 3, orig_col is 49, first->Text() ':', type is CONSTR_COLON
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 4, orig_col is 1, [FUNC_CTOR_VAR/NONE], Text() 'pTelName' <==>
-space_col_align : second->orig_line is 4, orig_col is 9 [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(', [CallStack]
-do_space : orig_line is 4, orig_col is 1, first->Text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 4, first->orig_col is 1, first->Text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 4, second->orig_col is 9, second->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->Text()     is 'pTelName'
-space_col_align :    => second->Text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 9
-space_col_align :    => first->Len()      is 8
-space_col_align :    => coldiff is 8
-space_col_align : first->orig_line is 4, orig_col is 9, [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(' <==>
-space_col_align : second->orig_line is 4, orig_col is 10 [WORD/NONE], Text() 'pN', [CallStack]
-do_space : orig_line is 4, orig_col is 9, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 4, first->orig_col is 9, first->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 10, second->Text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->Text()     is '('
-space_col_align :    => second->Text()    is 'pN'
-space_col_align :    => first->orig_col   is 9
-space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 4, orig_col is 10, [WORD/NONE], Text() 'pN' <==>
-space_col_align : second->orig_line is 4, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')', [CallStack]
-do_space : orig_line is 4, orig_col is 10, first->Text() 'pN', type is WORD
-do_space : first->orig_line is 4, first->orig_col is 10, first->Text() is 'pN', [WORD/NONE] <===>
-           second->orig_line is 4, second->orig_col is 12, second->Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->Text()     is 'pN'
-space_col_align :    => second->Text()    is ')'
-space_col_align :    => first->orig_col   is 10
-space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->Len()      is 2
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 4, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')' <==>
-space_col_align : second->orig_line is 4, orig_col is 13 [COMMA/NONE], Text() ',', [CallStack]
-do_space : orig_line is 4, orig_col is 12, first->Text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 4, first->orig_col is 12, first->Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
-           second->orig_line is 4, second->orig_col is 13, second->Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 4, orig_col is 13, [COMMA/NONE], Text() ',' <==>
-space_col_align : second->orig_line is 4, orig_col is 14 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 4, orig_col is 13, first->Text() ',', type is COMMA
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 1, [FUNC_CTOR_VAR/NONE], Text() 'nTelIndex' <==>
-space_col_align : second->orig_line is 5, orig_col is 10 [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(', [CallStack]
-do_space : orig_line is 5, orig_col is 1, first->Text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 5, first->orig_col is 1, first->Text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
-           second->orig_line is 5, second->orig_col is 10, second->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 9
-space_col_align :    => coldiff is 9
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->Text()     is 'nTelIndex'
-space_col_align :    => second->Text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->Len()      is 9
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 5, orig_col is 10, [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(' <==>
-space_col_align : second->orig_line is 5, orig_col is 11 [WORD/NONE], Text() 'n', [CallStack]
-do_space : orig_line is 5, orig_col is 10, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 5, first->orig_col is 10, first->Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-           second->orig_line is 5, second->orig_col is 11, second->Text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->Text()     is '('
-space_col_align :    => second->Text()    is 'n'
-space_col_align :    => first->orig_col   is 10
-space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 11, [WORD/NONE], Text() 'n' <==>
-space_col_align : second->orig_line is 5, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')', [CallStack]
-do_space : orig_line is 5, orig_col is 11, first->Text() 'n', type is WORD
-do_space : first->orig_line is 5, first->orig_col is 11, first->Text() is 'n', [WORD/NONE] <===>
-           second->orig_line is 5, second->orig_col is 12, second->Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->Text()     is 'n'
-space_col_align :    => second->Text()    is ')'
-space_col_align :    => first->orig_col   is 11
-space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')' <==>
-space_col_align : second->orig_line is 5, orig_col is 13 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 5, orig_col is 12, first->Text() ')', type is FPAREN_CLOSE
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 6, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], Text() '{' <==>
-space_col_align : second->orig_line is 6, orig_col is 2 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 6, orig_col is 1, first->Text() '{', type is BRACE_OPEN
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 7, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], Text() '}' <==>
-space_col_align : second->orig_line is 7, orig_col is 2 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 7, orig_col is 1, first->Text() '}', type is BRACE_CLOSE
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 9, orig_col is 1, [DESTRUCTOR/FUNC_CLASS_DEF], Text() '~' <==>
-space_col_align : second->orig_line is 9, orig_col is 2 [FUNC_CLASS_DEF/DESTRUCTOR], Text() 'TelegramIndex', [CallStack]
-do_space : orig_line is 9, orig_col is 1, first->Text() '~', type is DESTRUCTOR
-do_space : first->orig_line is 9, first->orig_col is 1, first->Text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 2, second->Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 9, orig_col is 2, [FUNC_CLASS_DEF/DESTRUCTOR], Text() 'TelegramIndex' <==>
-space_col_align : second->orig_line is 9, orig_col is 15 [FPAREN_OPEN/FUNC_CLASS_DEF], Text() '(', [CallStack]
-do_space : orig_line is 9, orig_col is 2, first->Text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 9, first->orig_col is 2, first->Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
-           second->orig_line is 9, second->orig_col is 15, second->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 13
-space_col_align :    => coldiff is 13
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 9
-space_col_align :    => second->orig_line is 9
-space_col_align :    => first->Text()     is 'TelegramIndex'
-space_col_align :    => second->Text()    is '('
-space_col_align :    => first->orig_col   is 2
-space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->Len()      is 13
-space_col_align :    => coldiff is 13
-space_col_align : first->orig_line is 9, orig_col is 15, [FPAREN_OPEN/FUNC_CLASS_DEF], Text() '(' <==>
-space_col_align : second->orig_line is 9, orig_col is 16 [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')', [CallStack]
-do_space : orig_line is 9, orig_col is 15, first->Text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 9, first->orig_col is 15, first->Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-           second->orig_line is 9, second->orig_col is 16, second->Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 9
-space_col_align :    => second->orig_line is 9
-space_col_align :    => first->Text()     is '('
-space_col_align :    => second->Text()    is ')'
-space_col_align :    => first->orig_col   is 15
-space_col_align :    => second->orig_col  is 16
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 9, orig_col is 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')' <==>
-space_col_align : second->orig_line is 9, orig_col is 17 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 9, orig_col is 16, first->Text() ')', type is FPAREN_CLOSE
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 10, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], Text() '{' <==>
-space_col_align : second->orig_line is 10, orig_col is 2 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 10, orig_col is 1, first->Text() '{', type is BRACE_OPEN
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 11, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], Text() '}' <==>
-space_col_align : second->orig_line is 11, orig_col is 2 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 11, orig_col is 1, first->Text() '}', type is BRACE_CLOSE
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 13, orig_col is 1, [QUALIFIER/NONE], Text() 'const' <==>
-space_col_align : second->orig_line is 13, orig_col is 7 [TYPE/NONE], Text() 'char', [CallStack]
-do_space : orig_line is 13, orig_col is 1, first->Text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 1, first->Text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 7, second->Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>space_col_align : av is force
-space_col_align :    Len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-space_col_align : first->orig_line is 13, orig_col is 7, [TYPE/NONE], Text() 'char' <==>
-space_col_align : second->orig_line is 13, orig_col is 11 [PTR_TYPE/NONE], Text() '*', [CallStack]
-do_space : orig_line is 13, orig_col is 7, first->Text() 'char', type is TYPE
-do_space : first->orig_line is 13, first->orig_col is 7, first->Text() is 'char', [TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 11, second->Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 13
-space_col_align :    => second->orig_line is 13
-space_col_align :    => first->Text()     is 'char'
-space_col_align :    => second->Text()    is '*'
-space_col_align :    => first->orig_col   is 7
-space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->Len()      is 4
-space_col_align :    => coldiff is 4
-space_col_align : first->orig_line is 13, orig_col is 11, [PTR_TYPE/NONE], Text() '*' <==>
-space_col_align : second->orig_line is 13, orig_col is 13 [QUALIFIER/NONE], Text() 'const', [CallStack]
-do_space : orig_line is 13, orig_col is 11, first->Text() '*', type is PTR_TYPE
-do_space : first->orig_line is 13, first->orig_col is 11, first->Text() is '*', [PTR_TYPE/NONE] <===>
-           second->orig_line is 13, second->orig_col is 13, second->Text() is 'const', [QUALIFIER/NONE] : rule sp_after_ptr_star_qualifier[ ]
-space_col_align : av is ignore
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 13
-space_col_align :    => second->orig_line is 13
-space_col_align :    => first->Text()     is '*'
-space_col_align :    => second->Text()    is 'const'
-space_col_align :    => first->orig_col   is 11
-space_col_align :    => second->orig_col  is 13
-space_col_align :    => first->Len()      is 1
-space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 13, orig_col is 13, [QUALIFIER/NONE], Text() 'const' <==>
-space_col_align : second->orig_line is 13, orig_col is 19 [WORD/NONE], Text() 'pTelName', [CallStack]
-do_space : orig_line is 13, orig_col is 13, first->Text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 13, first->Text() is 'const', [QUALIFIER/NONE] <===>
-           second->orig_line is 13, second->orig_col is 19, second->Text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'pTelName'>space_col_align : av is force
-space_col_align :    Len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-space_col_align : first->orig_line is 13, orig_col is 19, [WORD/NONE], Text() 'pTelName' <==>
-space_col_align : second->orig_line is 13, orig_col is 27 [SEMICOLON/NONE], Text() ';', [CallStack]
-do_space : orig_line is 13, orig_col is 19, first->Text() 'pTelName', type is WORD
-do_space : first->orig_line is 13, first->orig_col is 19, first->Text() is 'pTelName', [WORD/NONE] <===>
-           second->orig_line is 13, second->orig_col is 27, second->Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
-space_col_align : av is remove
-space_col_align :    Len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 8
-space_col_align : first->orig_line is 13, orig_col is 27, [SEMICOLON/NONE], Text() ';' <==>
-space_col_align : second->orig_line is 13, orig_col is 28 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 13, orig_col is 27, first->Text() ';', type is SEMICOLON
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 14, orig_col is 1, [TYPE/NONE], Text() 'unsigned' <==>
-space_col_align : second->orig_line is 14, orig_col is 10 [TYPE/NONE], Text() 'long', [CallStack]
-do_space : orig_line is 14, orig_col is 1, first->Text() 'unsigned', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 1, first->Text() is 'unsigned', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 10, second->Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>space_col_align : av is force
-space_col_align :    Len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 14, orig_col is 10, [TYPE/NONE], Text() 'long' <==>
-space_col_align : second->orig_line is 14, orig_col is 15 [WORD/NONE], Text() 'nTelIndex', [CallStack]
-do_space : orig_line is 14, orig_col is 10, first->Text() 'long', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 10, first->Text() is 'long', [TYPE/NONE] <===>
-           second->orig_line is 14, second->orig_col is 15, second->Text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nTelIndex'>space_col_align : av is force
-space_col_align :    Len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 5
-space_col_align : first->orig_line is 14, orig_col is 15, [WORD/NONE], Text() 'nTelIndex' <==>
-space_col_align : second->orig_line is 14, orig_col is 24 [SEMICOLON/NONE], Text() ';', [CallStack]
-do_space : orig_line is 14, orig_col is 15, first->Text() 'nTelIndex', type is WORD
-do_space : first->orig_line is 14, first->orig_col is 15, first->Text() is 'nTelIndex', [WORD/NONE] <===>
-           second->orig_line is 14, second->orig_col is 24, second->Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
-space_col_align : av is remove
-space_col_align :    Len is 9
-space_col_align :    => coldiff is 9
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 14, orig_col is 24, [SEMICOLON/NONE], Text() ';' <==>
-space_col_align : second->orig_line is 14, orig_col is 25 [NEWLINE/NONE], Text() '', [CallStack]
-do_space : orig_line is 14, orig_col is 24, first->Text() ';', type is SEMICOLON
-space_col_align : av is remove
-space_col_align :    Len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/92.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/92.txt
deleted file mode 100644
index 95a7ecd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/92.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-parse_word : orig_line is 1, orig_col is 1, pc->Text() 'struct'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 1, orig_col is 1, pc->Text() 'struct'
-   pc->type is WORD, pc->parent_type is NONE => *type is STRUCT, *parent_type is NONE
-parse_whitespace : orig_line is 1, orig_col is 7, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 1, orig_col is 8, pc->Text() 'TelegramIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_whitespace : orig_line is 1, orig_col is 21, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 2, orig_col is 1, pc->Text() '{'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_OPEN, *parent_type is NONE
-parse_whitespace : orig_line is 2, orig_col is 2, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 1, pc->Text() 'TelegramIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 14, pc->Text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 15, pc->Text() 'const'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 15, pc->Text() 'const'
-   pc->type is WORD, pc->parent_type is NONE => *type is QUALIFIER, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 20, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 21, pc->Text() 'char'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 21, pc->Text() 'char'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 25, pc->Text() '*'
-   pc->type is NONE, pc->parent_type is NONE => *type is STAR, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 26, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 27, pc->Text() 'pN'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 29, pc->Text() ','
-   pc->type is NONE, pc->parent_type is NONE => *type is COMMA, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 30, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 31, pc->Text() 'unsigned'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 31, pc->Text() 'unsigned'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 39, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 40, pc->Text() 'long'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 40, pc->Text() 'long'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 44, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 3, orig_col is 45, pc->Text() 'nI'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 47, pc->Text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 48, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_next : orig_line is 3, orig_col is 49, pc->Text() ':'
-   pc->type is NONE, pc->parent_type is NONE => *type is COLON, *parent_type is NONE
-parse_whitespace : orig_line is 3, orig_col is 50, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 4, orig_col is 1, pc->Text() 'pTelName'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 4, orig_col is 9, pc->Text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_word : orig_line is 4, orig_col is 10, pc->Text() 'pN'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 4, orig_col is 12, pc->Text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_next : orig_line is 4, orig_col is 13, pc->Text() ','
-   pc->type is NONE, pc->parent_type is NONE => *type is COMMA, *parent_type is NONE
-parse_whitespace : orig_line is 4, orig_col is 14, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 5, orig_col is 1, pc->Text() 'nTelIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 5, orig_col is 10, pc->Text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_word : orig_line is 5, orig_col is 11, pc->Text() 'n'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 5, orig_col is 12, pc->Text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 5, orig_col is 13, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 6, orig_col is 1, pc->Text() '{'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_OPEN, *parent_type is NONE
-parse_whitespace : orig_line is 6, orig_col is 2, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 7, orig_col is 1, pc->Text() '}'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 7, orig_col is 2, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 9, orig_col is 1, pc->Text() '~'
-   pc->type is NONE, pc->parent_type is NONE => *type is INV, *parent_type is NONE
-parse_word : orig_line is 9, orig_col is 2, pc->Text() 'TelegramIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 9, orig_col is 15, pc->Text() '('
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_OPEN, *parent_type is NONE
-parse_next : orig_line is 9, orig_col is 16, pc->Text() ')'
-   pc->type is NONE, pc->parent_type is NONE => *type is PAREN_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 9, orig_col is 17, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 10, orig_col is 1, pc->Text() '{'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_OPEN, *parent_type is NONE
-parse_whitespace : orig_line is 10, orig_col is 2, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 11, orig_col is 1, pc->Text() '}'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_CLOSE, *parent_type is NONE
-parse_whitespace : orig_line is 11, orig_col is 2, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 1, pc->Text() 'const'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 1, pc->Text() 'const'
-   pc->type is WORD, pc->parent_type is NONE => *type is QUALIFIER, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 6, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 7, pc->Text() 'char'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 7, pc->Text() 'char'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_next : orig_line is 13, orig_col is 11, pc->Text() '*'
-   pc->type is NONE, pc->parent_type is NONE => *type is STAR, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 12, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 13, pc->Text() 'const'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 13, pc->Text() 'const'
-   pc->type is WORD, pc->parent_type is NONE => *type is QUALIFIER, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 18, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 13, orig_col is 19, pc->Text() 'pTelName'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 13, orig_col is 27, pc->Text() ';'
-   pc->type is NONE, pc->parent_type is NONE => *type is SEMICOLON, *parent_type is NONE
-parse_whitespace : orig_line is 13, orig_col is 28, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 1, pc->Text() 'unsigned'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 1, pc->Text() 'unsigned'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 14, orig_col is 9, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 10, pc->Text() 'long'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 10, pc->Text() 'long'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-parse_whitespace : orig_line is 14, orig_col is 14, pc->Text() ''
-   pc->type is NONE, pc->parent_type is NONE => *type is WHITESPACE, *parent_type is NONE
-parse_word : orig_line is 14, orig_col is 15, pc->Text() 'nTelIndex'
-   pc->type is NONE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-parse_next : orig_line is 14, orig_col is 24, pc->Text() ';'
-   pc->type is NONE, pc->parent_type is NONE => *type is SEMICOLON, *parent_type is NONE
-parse_whitespace : orig_line is 14, orig_col is 25, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-parse_next : orig_line is 15, orig_col is 1, pc->Text() '}'
-   pc->type is NONE, pc->parent_type is NONE => *type is BRACE_CLOSE, *parent_type is NONE
-parse_next : orig_line is 15, orig_col is 2, pc->Text() ';'
-   pc->type is NONE, pc->parent_type is NONE => *type is SEMICOLON, *parent_type is NONE
-parse_whitespace : orig_line is 15, orig_col is 3, pc->Text() <Newline>
-   pc->type is NONE, pc->parent_type is NONE => *type is NEWLINE, *parent_type is NONE
-tokenize_cleanup : orig_line is 1, orig_col is 8, pc->Text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-tokenize_cleanup : orig_line is 3, orig_col is 25, pc->Text() '*'
-   pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE
-tokenize_cleanup : orig_line is 13, orig_col is 11, pc->Text() '*'
-   pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE
-try_find_end_chunk : orig_line is 1, orig_col is 8, pc->Text() 'TelegramIndex'
-   pc->type is TYPE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
-make_type : orig_line is 1, orig_col is 8, pc->Text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
-mark_constructors : orig_line is 3, orig_col is 1, pc->Text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE
-flag_parens : orig_line is 3, orig_col is 14, pc->Text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 3, orig_col is 47, pc->Text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
-mark_cpp_constructor : orig_line is 3, orig_col is 49, pc->Text() ':'
-   pc->type is COLON, pc->parent_type is NONE => *type is CONSTR_COLON, *parent_type is NONE
-mark_cpp_constructor : orig_line is 4, orig_col is 1, pc->Text() 'pTelName'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CTOR_VAR, *parent_type is NONE
-flag_parens : orig_line is 4, orig_col is 9, pc->Text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 4, orig_col is 12, pc->Text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
-mark_cpp_constructor : orig_line is 5, orig_col is 1, pc->Text() 'nTelIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CTOR_VAR, *parent_type is NONE
-flag_parens : orig_line is 5, orig_col is 10, pc->Text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 5, orig_col is 12, pc->Text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
-mark_constructors : orig_line is 9, orig_col is 2, pc->Text() 'TelegramIndex'
-   pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE
-mark_cpp_constructor : orig_line is 9, orig_col is 1, pc->Text() '~'
-   pc->type is INV, pc->parent_type is NONE => *type is DESTRUCTOR, *parent_type is NONE
-flag_parens : orig_line is 9, orig_col is 15, pc->Text() '('
-   pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
-flag_parens : orig_line is 9, orig_col is 16, pc->Text() ')'
-   pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/Debug_tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/Debug_tracking_space.html
deleted file mode 100644
index b7adc237..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/Debug_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 title="1,REMOVE"><font color="red">M</font></a>
-   a<a title="2,sp_assign"><font color="red">M</font></a>=<a title="3,86,sp_assign"><font color="red">M</font></a>b<a title="4,87,93,sp_arith"><font color="red">M</font></a>+<a title="5,88,94,99,sp_arith"><font color="red">M</font></a>111<a title="6,89,95,100,104,sp_arith"><font color="red">M</font></a>-<a title="7,90,96,101,105,108,sp_arith"><font color="red">M</font></a>55<a title="8,91,97,102,106,109,111,sp_before_semi"><font color="red">M</font></a>;<a title="9,92,98,103,107,110,112,113,REMOVE"><font color="red">M</font></a>
-}<a title="10,REMOVE"><font color="red">M</font></a>
-template<a title="11,sp_before_angle"><font color="red">M</font></a>&lt;<a title="12,114,sp_inside_angle"><font color="red">M</font></a>typename<a title="13,115,123,ADD from add_space_table"><font color="red">M</font></a>...<a title="14,116,124,131,sp_ellipsis_parameter_pack"><font color="red">M</font></a>A<a title="15,117,125,132,138,sp_before_comma"><font color="red">M</font></a>,<a title="16,118,126,133,139,144,sp_after_comma"><font color="red">M</font></a>int<a title="17,119,127,134,140,145,149,sp_type_ellipsis"><font color="red">M</font></a>...<a title="18,120,128,135,141,146,150,153,FORCE"><font color="red">M</font></a>B<a title="19,121,129,136,142,147,151,154,156,sp_inside_angle"><font color="red">M</font></a>&gt;<a title="20,122,130,137,143,148,152,155,157,158,REMOVE"><font color="red">M</font></a>
-struct<a title="21,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="22,159,sp_after_type"><font color="red">M</font></a>:<a title="23,160,177,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="24,161,178,194,sp_before_angle"><font color="red">M</font></a>&lt;<a title="25,162,179,195,210,sp_inside_angle"><font color="red">M</font></a>A<a title="26,163,180,196,211,225,sp_parameter_pack_ellipsis"><font color="red">M</font></a>...<a title="27,164,181,197,212,226,239,sp_before_comma"><font color="red">M</font></a>,<a title="28,165,182,198,213,227,240,252,sp_after_comma"><font color="red">M</font></a>(<a title="29,166,183,199,214,228,241,253,264,sp_inside_paren"><font color="red">M</font></a>sizeof<a title="30,167,184,200,215,229,242,254,265,275,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="31,168,185,201,216,230,243,255,266,276,285,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="32,169,186,202,217,231,244,256,267,277,286,294,sp_inside_paren"><font color="red">M</font></a>A<a title="33,170,187,203,218,232,245,257,268,278,287,295,302,sp_inside_paren"><font color="red">M</font></a>)<a title="34,171,188,204,219,233,246,258,269,279,288,296,303,309,sp_arith"><font color="red">M</font></a>+<a title="35,172,189,205,220,234,247,259,270,280,289,297,304,310,315,sp_arith"><font color="red">M</font></a>B<a title="36,173,190,206,221,235,248,260,271,281,290,298,305,311,316,320,sp_inside_paren"><font color="red">M</font></a>)<a title="37,174,191,207,222,236,249,261,272,282,291,299,306,312,317,321,324,sp_paren_ellipsis"><font color="red">M</font></a>...<a title="38,175,192,208,223,237,250,262,273,283,292,300,307,313,318,322,325,327,sp_inside_angle"><font color="red">M</font></a>&gt;<a title="39,176,193,209,224,238,251,263,274,284,293,301,308,314,319,323,326,328,329,REMOVE"><font color="red">M</font></a>
-{<a title="40,REMOVE"><font color="red">M</font></a>
-   foo1<a title="41,64,sp_func_class_paren"><font color="red">M</font></a>(<a title="42,65,330,sp_inside_fparens"><font color="red">M</font></a>)<a title="43,66,331,333,sp_fparen_brace"><font color="red">M</font></a>{<a title="44,67,332,334,335,REMOVE"><font color="red">M</font></a>
-      int<a title="45,68,sp_after_type"><font color="red">M</font></a>x<a title="46,69,336,sp_assign"><font color="red">M</font></a>=<a title="47,70,337,344,sp_assign"><font color="red">M</font></a>sizeof<a title="48,71,338,345,351,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="49,72,339,346,352,357,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="50,73,340,347,353,358,362,sp_inside_paren"><font color="red">M</font></a>A<a title="51,74,341,348,354,359,363,366,sp_inside_paren"><font color="red">M</font></a>)<a title="52,75,342,349,355,360,364,367,369,sp_before_semi"><font color="red">M</font></a>;<a title="53,76,343,350,356,361,365,368,370,371,REMOVE"><font color="red">M</font></a>
-      bool<a title="54,77,sp_after_type"><font color="red">M</font></a>b<a title="55,78,372,sp_assign"><font color="red">M</font></a>=<a title="56,79,373,378,sp_assign"><font color="red">M</font></a>x<a title="57,80,374,379,383,sp_compare"><font color="red">M</font></a>><a title="58,81,375,380,384,387,sp_compare"><font color="red">M</font></a>1<a title="59,82,376,381,385,388,390,sp_before_semi"><font color="red">M</font></a>;<a title="60,83,377,382,386,389,391,392,REMOVE"><font color="red">M</font></a>
-   }<a title="61,84,REMOVE"><font color="red">M</font></a>
-}<a title="62,sp_before_semi"><font color="red">M</font></a>;<a title="63,393,REMOVE"><font color="red">M</font></a>
-</pre>
-</body>
-</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.txt
deleted file mode 100644
index c104ff44..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.txt
+++ /dev/null
@@ -1,692 +0,0 @@
-
-# option(s) with 'not default' value: 0
-#
-# -=====-
-# number of loops               = 1
-# -=====-
-# language                      = CPP
-# -=====-
-# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp         Flag   Nl  Text
-#   1>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  3][0/0/0][             0][9-0] /**␤    * the enum (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * "enum type [: integral_type] { ... } [x, ...]"␤    * "enum type [: integral_type]"␤    * "enum class type [: integral_type] { ... } [x, ...]"␤    * "enum class type [: integral_type]"␤    * "enum [: integral_type] { ... } x, ..."␤    */
-#  10>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  4/  0][0/0/0][             0][2-0]
-#  12>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  0][0/0/0][             0][9-0] /**␤    * the class/struct (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }␤    * template<...> class/struct[<...>] [macros/attributes ...] type␤    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]␤    * class/struct [macros/attributes ...] type [x, ...]␤    * class/struct [macros/attributes ...] [: bases] { } x, ...␤    */
-#  21>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][             0][2-0]
-#  23>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][   2 001c 0001][0-0] #
-#  23>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/0][        2 0001][0-0]  define
-#  23>         MACRO_FUNC|               NONE|     PARENT_NOT_SET[  9/  9/ 16/  1][1/1/0][        8 0001][0-0]         ALIGNAS
-#  23>        FPAREN_OPEN|         MACRO_FUNC|     PARENT_NOT_SET[ 16/ 16/ 17/  0][1/1/0][   2 0000 0001][0-0]                (
-#  23>               WORD|               NONE|     PARENT_NOT_SET[ 17/ 17/ 31/  0][1/2/0][        8 0011][0-0]                 byte_alignment
-#  23>       FPAREN_CLOSE|         MACRO_FUNC|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][   2 0000 0011][0-0]                               )
-#  23>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 33/ 33/ 46/  1][1/1/0][             1][0-0]                                 __attribute__
-#  23>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/1/0][   2 0000 0001][0-0]                                              (
-#  23>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][1/2/0][   2 0008 0001][0-0]                                               (
-#  23>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 55/  0][1/3/0][        8 0001][0-0]                                                aligned
-#  23>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 55/ 55/ 56/  0][1/3/0][   2 0000 0001][0-0]                                                       (
-#  23>               WORD|               NONE|     PARENT_NOT_SET[ 56/ 56/ 70/  0][1/4/0][        8 0011][0-0]                                                        byte_alignment
-#  23>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 70/ 70/ 71/  0][1/3/0][   2 0000 0011][0-0]                                                                      )
-#  23>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 72/  0][1/2/0][   2 0000 0001][0-0]                                                                       )
-#  23>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 72/ 72/ 73/  0][1/1/0][   2 0000 0001][0-0]                                                                        )
-#  23>            NEWLINE|               NONE|     PARENT_NOT_SET[ 73/ 73/  1/  0][0/0/0][             0][2-0]
-#  25>            PREPROC|              PP_IF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0010 0001][0-0] #
-#  25>              PP_IF|               NONE|     PARENT_NOT_SET[  2/  2/  4/  0][0/0/1][        2 0001][0-0]  if
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  5/  5/ 12/  1][0/0/1][        8 0001][0-0]     defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/1][   2 0000 0001][0-0]             (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 22/  0][0/0/1][        8 0001][0-0]              __unix__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/1][   2 0000 0001][0-0]                      )
-#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][0/0/1][   2 0000 0001][0-0]                        ||
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/1][   2 0000 0001][0-0]                           (
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 28/ 28/ 35/  0][0/0/1][        8 0001][0-0]                            defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  1][0/0/1][   2 0000 0001][0-0]                                    (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 46/  0][0/0/1][        8 0001][0-0]                                     __APPLE__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][0/0/1][   2 0000 0001][0-0]                                              )
-#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  1][0/0/1][   2 0000 0001][0-0]                                                &&
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 51/ 51/ 58/  1][0/0/1][             1][0-0]                                                   defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  1][0/0/1][   2 0000 0001][0-0]                                                           (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 60/ 60/ 68/  0][0/0/1][        8 0001][0-0]                                                            __MACH__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/1][   2 0000 0001][0-0]                                                                    )
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 69/ 69/ 70/  0][0/0/1][   2 0000 0001][0-0]                                                                     )
-#  25>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/1][             0][1-0]
-#  26>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][   2 001c 0001][0-0] #
-#  26>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][        2 0001][0-0]  define
-#  26>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][        2 0001][0-0]         API_EXPORT
-#  26>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 20/ 20/ 33/  1][1/1/1][        8 0001][0-0]                    __attribute__
-#  26>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 34/ 34/ 35/  1][1/1/1][   2 000c 0001][0-0]                                  (
-#  26>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/2/1][   2 0008 0001][0-0]                                   (
-#  26>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 36/ 36/ 46/  0][1/3/1][        8 0001][0-0]                                    visibility
-#  26>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/3/1][   2 0000 0001][0-0]                                              (
-#  26>             STRING|         PP_INCLUDE|     PARENT_NOT_SET[ 47/ 47/ 56/  0][1/4/1][        8 0011][0-0]                                               "default"
-#  26>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 56/ 56/ 57/  0][1/3/1][   2 0000 0011][0-0]                                                        )
-#  26>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 57/ 57/ 58/  0][1/2/1][   2 0000 0001][0-0]                                                         )
-#  26>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][1/1/1][   2 0000 0001][0-0]                                                          )
-#  26>            NEWLINE|               NONE|     PARENT_NOT_SET[ 59/ 59/  1/  0][0/0/1][             0][1-0]
-#  27>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0010 0001][0-0] #
-#  27>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][        2 0001][0-0]  elif
-#  27>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/1][        a 0001][0-0]       defined
-#  27>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 21/  1][0/0/1][             1][0-0]               _WIN32
-#  27>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/1][             0][1-0]
-#  28>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][   2 001c 0001][0-0] #
-#  28>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][        2 0001][0-0]  define
-#  28>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][        2 0001][0-0]         API_EXPORT
-#  28>           DECLSPEC|               NONE|     PARENT_NOT_SET[ 20/ 20/ 30/  1][1/1/1][        c 0001][0-0]                    __declspec
-#  28>         PAREN_OPEN|           DECLSPEC|     PARENT_NOT_SET[ 30/ 30/ 31/  0][1/1/1][   2 0000 0001][0-0]                              (
-#  28>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 40/  0][1/2/1][        8 0001][0-0]                               dllexport
-#  28>        PAREN_CLOSE|           DECLSPEC|     PARENT_NOT_SET[ 40/ 40/ 41/  0][1/1/1][   2 0000 0001][0-0]                                        )
-#  28>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 41/  1/  0][0/0/1][             0][1-0]
-#  29>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0010 0001][0-0] #
-#  29>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][             1][0-0]  else
-#  29>            NEWLINE|               NONE|     PARENT_NOT_SET[  6/  6/  1/  0][0/0/1][             0][1-0]
-#  30>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][   2 001c 0001][0-0] #
-#  30>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][        2 0001][0-0]  define
-#  30>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][             1][0-0]         API_EXPORT
-#  30>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/1][             0][1-0]
-#  31>            PREPROC|           PP_ENDIF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0010 0001][0-0] #
-#  31>           PP_ENDIF|               NONE|              PP_IF[  2/  2/  7/  0][0/0/0][             1][0-0]  endif
-#  31>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][             0][2-0]
-#  33>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][0/0/0][        e 0000][0-0] namespace
-#  33>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][0/0/0][             0][0-0]           outer_namespace
-#  33>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][0/0/0][             0][1-0]
-#  34>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0000][0-0] {
-#  34>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][          1000][2-0]
-#  36>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][1/1/0][        e 1000][0-0] namespace
-#  36>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][1/1/0][          1000][0-0]           inner_namespace
-#  36>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][1/1/0][          1000][1-0]
-#  37>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][   2 0000 1000][0-0] {
-#  37>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][2/2/0][          1000][2-0]
-#  39>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][2/2/0][        e 1000][0-0] class
-#  39>               TYPE|              CLASS|     PARENT_NOT_SET[  7/  7/ 12/  1][2/2/0][          1000][0-0]       Base1
-#  39>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 13/ 13/ 14/  1][2/2/0][   2 c000 1400][0-0]             {
-#  39>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 15/ 15/ 16/  1][2/2/0][   2 c000 1400][0-0]               }
-#  39>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 16/ 16/ 17/  0][2/2/0][   2 0000 0000][0-0]                ;
-#  39>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][2/2/0][             0][2-0]
-#  41>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][2/2/0][        c 0000][0-0] template
-#  41>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][2/2/0][   2 0000 0040][0-0]         <
-#  41>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][2/3/0][        8 0040][0-0]          typename
-#  41>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][2/2/0][   2 0000 0040][0-0]                  >
-#  41>              CLASS|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 25/  1][2/2/0][        a 0000][0-0]                    class
-#  41>               TYPE|              CLASS|     PARENT_NOT_SET[ 26/ 26/ 31/  1][2/2/0][             0][0-0]                          Base2
-#  41>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 32/ 32/ 33/  1][2/2/0][   2 c000 0400][0-0]                                {
-#  41>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 34/ 34/ 35/  1][2/2/0][   2 c000 0400][0-0]                                  }
-#  41>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 35/ 35/ 36/  0][2/2/0][   2 0000 0000][0-0]                                   ;
-#  41>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 36/  1/  0][2/2/0][             0][2-0]
-#  43>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][   2 0000 0000][0-0] }
-#  43>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][             0][2-0]
-#  45>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0000][0-0] }
-#  45>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][0/0/0][             0][2-0]
-#  47>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 82/  0][0/0/0][             0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }
-#  47>            NEWLINE|               NONE|     PARENT_NOT_SET[ 82/ 82/  1/  0][0/0/0][             0][1-0]
-#  48>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][        c 0000][0-0] template
-#  48>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][   2 0000 0040][0-0]         <
-#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][        8 0040][0-0]          typename
-#  48>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][   2 0000 0040][0-0]                  ,
-#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][        8 0040][0-0]                    typename
-#  48>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][   2 0000 0040][0-0]                             ...
-#  48>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][   2 0000 0040][0-0]                                >
-#  48>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][             0][1-0]
-#  49>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][        a 0000][0-0] class
-#  49>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][        2 0000][0-0]       API_EXPORT
-#  49>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][             0][0-0]                  __attribute__
-#  49>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][   2 0000 0000][0-0]                               (
-#  49>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][   2 0008 0000][0-0]                                (
-#  49>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][        8 0000][0-0]                                 __deprecated__
-#  49>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][   2 0000 0000][0-0]                                               )
-#  49>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][   2 0000 0000][0-0]                                                )
-#  49>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][             0][0-0]                                                  ALIGNAS
-#  49>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][   2 0000 0000][0-0]                                                         (
-#  49>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][        8 0000][0-0]                                                          4
-#  49>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][   2 0000 0000][0-0]                                                           )
-#  49>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][             0][0-0]                                                             c1
-#  49>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][             0][1-0]
-#  50>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][   2 0000 0800][0-0]         :
-#  50>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][        e 0800][0-0]           public
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][           800][0-0]                  outer_namespace
-#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][   2 0000 0800][0-0]                                 ::
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][           800][0-0]                                   inner_namespace
-#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][   2 0000 0800][0-0]                                                  ::
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][           800][0-0]                                                    Base1
-#  50>              COMMA|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][   2 0000 0800][0-0]                                                         ,
-#  50>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  3/  0][0/0/0][             0][1-0]
-#  51>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][        a 0800][0-0]         public
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 25/  1][0/0/0][           800][0-0]                outer_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 31/ 25/ 27/  0][0/0/0][   2 0000 0800][0-0]                               ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 33/ 27/ 42/  0][0/0/0][           800][0-0]                                 inner_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 42/ 44/  0][0/0/0][   2 0000 0800][0-0]                                                ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 50/ 44/ 49/  0][0/0/0][           800][0-0]                                                  Base2
-#  51>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 55/ 49/ 50/  0][0/0/0][   2 0000 0840][0-0]                                                       <
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 56/ 50/ 65/  0][0/1/0][        8 0840][0-0]                                                        outer_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 71/ 65/ 67/  0][0/1/0][   2 0000 0840][0-0]                                                                       ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 73/ 67/ 82/  0][0/1/0][           840][0-0]                                                                         inner_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 88/ 82/ 84/  0][0/1/0][   2 0000 0840][0-0]                                                                                        ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 90/ 84/ 89/  0][0/1/0][           840][0-0]                                                                                          Base1
-#  51>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 95/ 89/ 90/  0][0/0/0][   2 0000 0840][0-0]                                                                                               >
-#  51>            NEWLINE|               NONE|     PARENT_NOT_SET[ 96/ 90/  1/  0][0/0/0][             0][1-0]
-#  52>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 8008 0400][0-0] {
-#  52>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][           400][2-0]
-#  54>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 8000 0400][0-0] }
-#  54>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][   2 0000 0000][0-0]  ;
-#  54>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][             0][2-0]
-#  56>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 70/  0][0/0/0][             0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type { }
-#  56>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/0][             0][1-0]
-#  57>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][        c 0000][0-0] template
-#  57>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][   2 0000 0040][0-0]         <
-#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][        8 0040][0-0]          typename
-#  57>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][   2 0000 0040][0-0]                  ,
-#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][        8 0040][0-0]                    typename
-#  57>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][   2 0000 0040][0-0]                             ...
-#  57>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][   2 0000 0040][0-0]                                >
-#  57>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][             0][1-0]
-#  58>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][        a 0000][0-0] class
-#  58>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][        2 0000][0-0]       API_EXPORT
-#  58>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][             0][0-0]                  c2
-#  58>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][             0][1-0]
-#  59>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0400][0-0] {
-#  59>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][           400][1-0]
-#  60>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][        c 0400][0-0] public
-#  60>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][   2 0000 0400][0-0]       :
-#  60>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][           400][2-0]
-#  62>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  4/ 12/  0][1/1/0][        c 0400][0-0] template
-#  62>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/ 12/ 13/  0][1/1/0][   2 0000 0440][0-0]         <
-#  62>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 13/ 21/  0][1/2/0][        a 0440][0-0]          typename
-#  62>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][           440][0-0]                   T
-#  62>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 20/ 23/ 24/  0][1/1/0][   2 0000 0440][0-0]                    >
-#  62>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 24/  4/  0][1/1/0][           400][1-0]
-#  63>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[  1/  4/ 10/  0][1/1/0][        a 0400][0-0] struct
-#  63>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/ 11/ 22/  1][1/1/0][           400][0-0]        inner_class
-#  63>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 22/  4/  0][1/1/0][           400][1-0]
-#  64>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][   2 0000 0400][0-0] {
-#  64>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  5/  7/  0][2/2/0][           402][1-0]
-#  65>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  7/ 13/  0][2/2/0][       8e 0402][0-0]         static
-#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 14/ 25/  1][2/2/0][       80 0402][0-0]                inner_class
-#  65>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 27/ 25/ 26/  0][2/2/0][   2 0000 0442][0-0]                           <
-#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 28/ 26/ 27/  0][2/3/0][        8 0442][0-0]                            T
-#  65>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 29/ 27/ 28/  0][2/2/0][   2 0000 0442][0-0]                             >
-#  65>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 31/ 29/ 30/  1][2/2/0][   2 0088 0402][0-0]                               *
-#  65>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 30/ 43/  0][2/2/0][      308 0402][0-0]                                m_inner_class
-#  65>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 45/ 43/ 44/  0][2/2/0][   2 0000 0402][0-0]                                             ;
-#  65>            NEWLINE|               NONE|     PARENT_NOT_SET[ 46/ 44/  4/  0][2/2/0][           402][1-0]
-#  66>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][   2 0000 0402][0-0] }
-#  66>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  5/  6/  0][1/1/0][   2 0000 0400][0-0]  ;
-#  66>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  6/  1/  0][1/1/0][           400][1-0]
-#  67>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0400][0-0] }
-#  67>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][   2 0000 0000][0-0]  ;
-#  67>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][             0][2-0]
-#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][        c 0000][0-0] template
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][   2 0000 0040][0-0]         <
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][0/0/0][   2 0008 0040][0-0]          >
-#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[ 12/ 12/ 20/  1][0/0/0][        8 0000][0-0]            template
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][   2 0000 0040][0-0]                    <
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/0/0][   2 0008 0040][0-0]                     >
-#  69>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[ 23/ 23/ 29/  1][0/0/0][        a 0000][0-0]                       struct
-#  69>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 40/  1][0/0/0][        2 0000][0-0]                              API_EXPORT
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 41/ 41/ 43/  1][0/0/0][             0][0-0]                                         c2
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][   2 0000 0040][0-0]                                           <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 44/ 44/ 47/  0][0/1/0][        8 0040][0-0]                                            int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/0/0][   2 0000 0040][0-0]                                               >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  0][0/0/0][   2 0008 0000][0-0]                                                ::
-#  69>               TYPE|             STRUCT|     PARENT_NOT_SET[ 50/ 50/ 61/  0][0/0/0][       80 0000][0-0]                                                  inner_class
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][0/0/0][   2 0000 0040][0-0]                                                             <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/1/0][        8 0040][0-0]                                                              int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][   2 0000 0040][0-0]                                                                 >
-#  69>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  1][0/0/0][   2 0008 0000][0-0]                                                                   *
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 70/  0][0/0/0][        8 0000][0-0]                                                                    c2
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 70/ 70/ 71/  0][0/0/0][   2 0000 0040][0-0]                                                                      <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 74/  0][0/1/0][        8 0040][0-0]                                                                       int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 74/ 74/ 75/  0][0/0/0][   2 0000 0040][0-0]                                                                          >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 75/ 75/ 77/  0][0/0/0][   2 0008 0000][0-0]                                                                           ::
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 77/ 77/ 88/  0][0/0/0][             0][0-0]                                                                             inner_class
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 88/ 88/ 89/  0][0/0/0][   2 0000 0040][0-0]                                                                                        <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 89/ 89/ 92/  0][0/1/0][        8 0040][0-0]                                                                                         int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 92/ 92/ 93/  0][0/0/0][   2 0000 0040][0-0]                                                                                            >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 93/ 93/ 95/  0][0/0/0][   2 0008 0000][0-0]                                                                                             ::
-#  69>               WORD|               NONE|     PARENT_NOT_SET[ 95/ 95/108/  0][0/0/0][     2300 0000][0-0]                                                                                               m_inner_class
-#  69>             ASSIGN|               NONE|     PARENT_NOT_SET[109/109/110/  1][0/0/0][   2 0000 0000][0-0]                                                                                                             =
-#  69>               WORD|               NONE|     PARENT_NOT_SET[111/111/118/  1][0/0/0][        8 0000][0-0]                                                                                                               nullptr
-#  69>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[118/118/119/  0][0/0/0][   2 0000 0000][0-0]                                                                                                                      ;
-#  69>            NEWLINE|               NONE|     PARENT_NOT_SET[119/119/  1/  0][0/0/0][             0][2-0]
-#  71>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 66/  0][0/0/0][             0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type
-#  71>            NEWLINE|               NONE|     PARENT_NOT_SET[ 66/ 66/  1/  0][0/0/0][             0][1-0]
-#  72>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][        c 0000][0-0] template
-#  72>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][   2 0000 0040][0-0]         <
-#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][        8 0040][0-0]          typename
-#  72>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][   2 0000 0040][0-0]                  ,
-#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][        8 0040][0-0]                    typename
-#  72>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][   2 0000 0040][0-0]                             ...
-#  72>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][   2 0000 0040][0-0]                                >
-#  72>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][             0][1-0]
-#  73>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][1000 000a 0000][0-0] class
-#  73>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][1000 0002 0000][0-0]       API_EXPORT
-#  73>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][1000 0000 0000][0-0]                  c2
-#  73>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][   2 0000 0000][0-0]                    ;
-#  73>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/0][             0][2-0]
-#  75>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][             0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
-#  75>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][             0][1-0]
-#  76>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][        e 0000][0-0] class
-#  76>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][        2 0000][0-0]       API_EXPORT
-#  76>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][             0][0-0]                  __attribute__
-#  76>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][   2 0000 0000][0-0]                               (
-#  76>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][   2 0008 0000][0-0]                                (
-#  76>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][        8 0000][0-0]                                 __deprecated__
-#  76>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][   2 0000 0000][0-0]                                               )
-#  76>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][   2 0000 0000][0-0]                                                )
-#  76>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][             0][0-0]                                                  ALIGNAS
-#  76>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][   2 0000 0000][0-0]                                                         (
-#  76>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][        8 0000][0-0]                                                          4
-#  76>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][   2 0000 0000][0-0]                                                           )
-#  76>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][       80 0000][0-0]                                                             c3
-#  76>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][             0][1-0]
-#  77>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][   2 0000 0800][0-0]         :
-#  77>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][        e 0800][0-0]           public
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][           800][0-0]                  outer_namespace
-#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][   2 0000 0800][0-0]                                 ::
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][           800][0-0]                                   inner_namespace
-#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][   2 0000 0800][0-0]                                                  ::
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][           800][0-0]                                                    Base2
-#  77>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][   2 0000 0840][0-0]                                                         <
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 58/ 50/ 53/  0][0/1/0][        8 0840][0-0]                                                          int
-#  77>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 61/ 53/ 54/  0][0/0/0][   2 0000 0840][0-0]                                                             >
-#  77>              COMMA|               NONE|     PARENT_NOT_SET[ 62/ 54/ 55/  0][0/0/0][   2 0008 0800][0-0]                                                              ,
-#  77>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 55/  3/  0][0/0/0][             0][1-0]
-#  78>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][        a 0800][0-0]         public
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 12/  1][0/0/0][           800][0-0]                c2
-#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 18/ 12/ 13/  0][0/0/0][   2 0000 0840][0-0]                  <
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 13/ 16/  0][0/1/0][        8 0840][0-0]                   int
-#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 22/ 16/ 17/  0][0/0/0][   2 0000 0840][0-0]                      >
-#  78>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 23/ 17/ 19/  0][0/0/0][   2 0008 0800][0-0]                       ::
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 25/ 19/ 30/  0][0/0/0][           800][0-0]                         inner_class
-#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 36/ 30/ 31/  0][0/0/0][   2 0000 0840][0-0]                                    <
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 37/ 31/ 34/  0][0/1/0][        8 0840][0-0]                                     int
-#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 40/ 34/ 35/  0][0/0/0][   2 0000 0840][0-0]                                        >
-#  78>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 35/  1/  0][0/0/0][             0][1-0]
-#  79>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0008 0400][0-0] {
-#  79>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][           400][1-0]
-#  80>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][        c 0400][0-0] public
-#  80>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][   2 0000 0400][0-0]       :
-#  80>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][           400][1-0]
-#  81>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  1/  4/  6/  0][1/1/0][        c 0400][0-0] c3
-#  81>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  3/  6/  7/  0][1/1/0][   2 0000 0500][0-0]   (
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[  4/  7/ 10/  0][1/2/0][     208a 0510][0-0]    int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  1][1/2/0][     2100 0510][0-0]        x
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 10/ 13/ 14/  1][1/2/0][   2 0000 0510][0-0]          =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 12/ 15/ 16/  1][1/2/0][        8 0510][0-0]            0
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 13/ 16/ 17/  0][1/2/0][   2 0000 0510][0-0]             ,
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 15/ 18/ 21/  1][1/2/0][     208a 0510][0-0]               int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][     2100 0510][0-0]                   y
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 21/ 24/ 25/  1][1/2/0][   2 0000 0510][0-0]                     =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 23/ 26/ 27/  1][1/2/0][        8 0510][0-0]                       0
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 27/ 28/  0][1/2/0][   2 0000 0510][0-0]                        ,
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 26/ 29/ 32/  1][1/2/0][     208a 0510][0-0]                          int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 33/ 34/  1][1/2/0][     2100 0510][0-0]                              z
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 32/ 35/ 36/  1][1/2/0][   2 0000 0510][0-0]                                =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 34/ 37/ 38/  1][1/2/0][        8 0510][0-0]                                  0
-#  81>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 35/ 38/ 39/  0][1/1/0][   2 0000 0510][0-0]                                   )
-#  81>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 37/ 40/ 41/  1][1/1/0][   2 0000 0500][0-0]                                     :
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 39/ 42/ 45/  1][1/1/0][        c 0500][0-0]                                       m_x
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 42/ 45/ 46/  0][1/1/0][   2 0000 0500][0-0]                                          (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 43/ 46/ 47/  0][1/2/0][        8 0510][0-0]                                           x
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 44/ 47/ 48/  0][1/1/0][   2 0000 0510][0-0]                                            )
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 48/ 49/  0][1/1/0][   2 0000 0500][0-0]                                             ,
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 47/ 50/ 53/  1][1/1/0][        8 0500][0-0]                                               m_y
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 50/ 53/ 54/  0][1/1/0][   2 0000 0500][0-0]                                                  (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 51/ 54/ 55/  0][1/2/0][        8 0510][0-0]                                                   y
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 52/ 55/ 56/  0][1/1/0][   2 0000 0510][0-0]                                                    )
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 56/ 57/  0][1/1/0][   2 0000 0500][0-0]                                                     ,
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 55/ 58/ 61/  1][1/1/0][        8 0500][0-0]                                                       m_z
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 58/ 61/ 62/  0][1/1/0][   2 0000 0500][0-0]                                                          (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 59/ 62/ 63/  0][1/2/0][        8 0510][0-0]                                                           z
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 60/ 63/ 64/  0][1/1/0][   2 0000 0510][0-0]                                                            )
-#  81>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 62/ 65/ 66/  1][1/1/0][   2 8000 0400][0-0]                                                              {
-#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 67/  0/  0][1/1/0][           400][1-0]
-#  81>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  1/ 67/ 68/  1][1/1/0][   2 8000 0400][0-0] }
-#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/ 68/  4/  0][1/1/0][           400][2-0]
-#  83>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][       8e 0400][0-0] int
-#  83>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][      300 0400][0-0]     m_x
-#  83>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][   2 0000 0400][0-0]        ;
-#  83>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][           400][1-0]
-#  84>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][       8e 0400][0-0] int
-#  84>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][      300 0400][0-0]     m_y
-#  84>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][   2 0000 0400][0-0]        ;
-#  84>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][           400][1-0]
-#  85>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][       8e 0400][0-0] int
-#  85>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][      300 0400][0-0]     m_z
-#  85>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][   2 0000 0400][0-0]        ;
-#  85>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][           400][1-0]
-#  86>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0400][0-0] }
-#  86>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][      70c 0000][0-0]   c31
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][   2 0000 0000][0-0]      ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][   2 0008 0000][0-0]        *
-#  86>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][     2508 0000][0-0]         c32
-#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][   2 0000 0000][0-0]             =
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][        8 0000][0-0]               nullptr
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][   2 0000 0000][0-0]                      ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][   2 0008 0000][0-0]                        *
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][      508 0000][0-0]                         c33
-#  86>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][   2 0000 0000][0-0]                            []
-#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][   2 0000 0000][0-0]                               =
-#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][   2 4008 0000][0-0]                                 {
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][     4008 0000][0-0]                                   nullptr
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][   2 4000 0000][0-0]                                          ,
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][     4008 0000][0-0]                                            nullptr
-#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][   2 4000 0000][0-0]                                                    }
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][   2 0000 0000][0-0]                                                     ,
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 55/ 55/ 58/  1][0/0/0][     2508 0000][0-0]                                                       c34
-#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/0/0][   2 4000 0000][0-0]                                                          {
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 60/ 60/ 61/  1][1/1/0][     400c 0000][0-0]                                                            0
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][1/1/0][   2 4000 0000][0-0]                                                             ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 63/ 63/ 64/  1][1/1/0][     4008 0000][0-0]                                                               1
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 64/ 64/ 65/  0][1/1/0][   2 4000 0000][0-0]                                                                ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  1][1/1/0][     4008 0000][0-0]                                                                  2
-#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][   2 4000 0000][0-0]                                                                   }
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][   2 0000 0000][0-0]                                                                    ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 70/ 70/ 71/  1][0/0/0][   2 0008 0000][0-0]                                                                      *
-#  86>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 72/ 72/ 77/  1][0/0/0][        a 0000][0-0]                                                                        const
-#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 78/ 78/ 81/  1][0/0/0][      500 0000][0-0]                                                                              c35
-#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 81/ 81/ 82/  0][0/0/0][   2 0000 0000][0-0]                                                                                 (
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 89/  0][0/1/0][        8 0010][0-0]                                                                                  nullptr
-#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 89/ 89/ 90/  0][0/0/0][   2 0000 0010][0-0]                                                                                         )
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 90/ 90/ 91/  0][0/0/0][   2 0000 0000][0-0]                                                                                          ,
-#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 92/ 92/ 95/  1][0/0/0][      508 0000][0-0]                                                                                            c16
-#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][   2 0000 0000][0-0]                                                                                               (
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 96/ 96/ 97/  0][0/1/0][        8 0010][0-0]                                                                                                0
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 97/ 97/ 98/  0][0/1/0][   2 0000 0010][0-0]                                                                                                 ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 99/ 99/100/  1][0/1/0][        8 0010][0-0]                                                                                                   1
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[100/100/101/  0][0/1/0][   2 0000 0010][0-0]                                                                                                    ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[102/102/103/  1][0/1/0][        8 0010][0-0]                                                                                                      2
-#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[103/103/104/  0][0/0/0][   2 0000 0010][0-0]                                                                                                       )
-#  86>          SEMICOLON|              CLASS|     PARENT_NOT_SET[104/104/105/  0][0/0/0][   2 0000 0000][0-0]                                                                                                        ;
-#  86>            NEWLINE|               NONE|     PARENT_NOT_SET[105/105/  1/  0][0/0/0][             0][2-0]
-#  88>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 52/  0][0/0/0][             0][0-0] // class/struct [macros/attributes ...] type x, ...
-#  88>            NEWLINE|               NONE|     PARENT_NOT_SET[ 52/ 52/  1/  0][0/0/0][             0][1-0]
-#  89>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][        e 0000][0-0] class
-#  89>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[  7/  7/ 20/  1][0/0/0][             0][0-0]       __attribute__
-#  89>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][   2 0000 0000][0-0]                    (
-#  89>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/1/0][   2 0008 0000][0-0]                     (
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 22/ 22/ 36/  0][0/2/0][        8 0000][0-0]                      __deprecated__
-#  89>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/1/0][   2 0000 0000][0-0]                                    )
-#  89>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 37/ 37/ 38/  0][0/0/0][   2 0000 0000][0-0]                                     )
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 39/ 39/ 49/  1][0/0/0][        e 0000][0-0]                                       API_EXPORT
-#  89>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][             0][0-0]                                                  ALIGNAS
-#  89>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][   2 0000 0000][0-0]                                                         (
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][        8 0000][0-0]                                                          4
-#  89>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][   2 0000 0000][0-0]                                                           )
-#  89>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][       82 0000][0-0]                                                             c3
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 64/ 64/ 67/  1][0/0/0][      300 0000][0-0]                                                                c41
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][   2 0000 0000][0-0]                                                                   ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 69/ 69/ 70/  1][0/0/0][   2 0008 0000][0-0]                                                                     *
-#  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][   2 0000 0000][0-0]                                                                                ?
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 85/  1][0/0/0][        8 0000][0-0]                                                                                  c32
-#  89>         COND_COLON|               NONE|     PARENT_NOT_SET[ 86/ 86/ 87/  1][0/0/0][   2 0000 0000][0-0]                                                                                      :
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 88/ 88/ 95/  1][0/0/0][        c 0000][0-0]                                                                                        nullptr
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][   2 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]
-#  92>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][        e 0000][0-0] class
-#  92>          FUNC_CALL|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/0][             0][0-0]       ALIGNAS
-#  92>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][   2 0000 0000][0-0]              (
-#  92>             NUMBER|               NONE|     PARENT_NOT_SET[ 15/ 15/ 16/  0][0/1/0][        8 0010][0-0]               4
-#  92>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][   2 0000 0010][0-0]                )
-#  92>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 18/ 28/  1][0/0/0][        2 0000][0-0]                  API_EXPORT
-#  92>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 29/ 29/ 42/  1][0/0/0][             0][0-0]                             __attribute__
-#  92>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][0/0/0][   2 0000 0000][0-0]                                          (
-#  92>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/1/0][   2 0008 0000][0-0]                                           (
-#  92>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 58/  0][0/2/0][        8 0000][0-0]                                            __deprecated__
-#  92>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][   2 0000 0000][0-0]                                                          )
-#  92>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][   2 0000 0000][0-0]                                                           )
-#  92>            NEWLINE|               NONE|     PARENT_NOT_SET[ 60/ 60/  1/  0][0/0/0][             0][1-0]
-#  93>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][   2 0000 0800][0-0]         :
-#  93>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][        e 0800][0-0]           public
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][           800][0-0]                  outer_namespace
-#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][   2 0000 0800][0-0]                                 ::
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][           800][0-0]                                   inner_namespace
-#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][   2 0000 0800][0-0]                                                  ::
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][           800][0-0]                                                    Base1
-#  93>            NEWLINE|               NONE|     PARENT_NOT_SET[ 57/ 49/  1/  0][0/0/0][             0][1-0]
-#  94>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0000][0-0] {
-#  94>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][           400][1-0]
-#  95>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][        c 0400][0-0] public
-#  95>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][   2 0000 0400][0-0]       :
-#  95>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][           400][1-0]
-#  96>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][       8e 0400][0-0] int
-#  96>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][      300 0400][0-0]     m_x
-#  96>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][   2 0000 0400][0-0]        ;
-#  96>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][           400][1-0]
-#  97>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][       8e 0400][0-0] int
-#  97>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][      300 0400][0-0]     m_y
-#  97>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][   2 0000 0400][0-0]        ;
-#  97>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][           400][1-0]
-#  98>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][       8e 0400][0-0] int
-#  98>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][      300 0400][0-0]     m_z
-#  98>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][   2 0000 0400][0-0]        ;
-#  98>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][           400][1-0]
-#  99>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0400][0-0] }
-#  99>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][      70c 0000][0-0]   c51
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][   2 0000 0000][0-0]      ,
-#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][   2 0008 0000][0-0]        *
-#  99>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][     2508 0000][0-0]         c52
-#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][   2 0000 0000][0-0]             =
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][        8 0000][0-0]               nullptr
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][   2 0000 0000][0-0]                      ,
-#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][   2 0008 0000][0-0]                        *
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][      508 0000][0-0]                         c53
-#  99>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][   2 0000 0000][0-0]                            []
-#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][   2 0000 0000][0-0]                               =
-#  99>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][   2 4008 0000][0-0]                                 {
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][     4008 0000][0-0]                                   nullptr
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][   2 4000 0000][0-0]                                          ,
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][     4008 0000][0-0]                                            nullptr
-#  99>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][   2 4000 0000][0-0]                                                    }
-#  99>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][   2 0000 0000][0-0]                                                     ;
-#  99>            NEWLINE|               NONE|     PARENT_NOT_SET[ 54/ 54/  1/  0][0/0/0][             0][3-0]
-# 102>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 44/  0][0/0/0][             0][0-0] // enum type : integral_type { ... } x, ...
-# 102>            NEWLINE|               NONE|     PARENT_NOT_SET[ 44/ 44/  1/  0][0/0/0][             0][1-0]
-# 103>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][        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>         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]                         ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 29/  1][1/1/0][     4008 0004][0-0]                           b1
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 29/ 30/  0][1/1/0][   2 4000 0004][0-0]                             ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 33/  1][1/1/0][     4008 0004][0-0]                               d1
-# 103>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 34/ 34/ 35/  1][0/0/0][   2 4000 0004][0-0]                                  }
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 39/  1][0/0/0][      70c 0000][0-0]                                    e11
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 39/ 39/ 40/  0][0/0/0][   2 0000 0000][0-0]                                       ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 41/ 41/ 44/  1][0/0/0][      508 0000][0-0]                                         e12
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][   2 0000 0000][0-0]                                            ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  1][0/0/0][      508 0000][0-0]                                              e13
-# 103>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 49/ 49/ 50/  0][0/0/0][   2 0000 0000][0-0]                                                 ;
-# 103>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][             0][2-0]
-# 105>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 37/  0][0/0/0][             0][0-0] // enum type : integral_type { ... }
-# 105>            NEWLINE|               NONE|     PARENT_NOT_SET[ 37/ 37/  1/  0][0/0/0][             0][1-0]
-# 106>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][        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>         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]                            ,
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 32/  1][1/1/0][     4008 0004][0-0]                              b2
-# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][1/1/0][   2 4000 0004][0-0]                                ,
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 34/ 34/ 36/  1][1/1/0][     4008 0004][0-0]                                  d2
-# 106>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 37/ 37/ 38/  1][0/0/0][   2 4000 0004][0-0]                                     }
-# 106>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 38/ 38/ 39/  0][0/0/0][   2 0000 0000][0-0]                                      ;
-# 106>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][             0][2-0]
-# 108>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 29/  0][0/0/0][             0][0-0] // enum type : integral_type
-# 108>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 29/  1/  0][0/0/0][             0][1-0]
-# 109>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][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>          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, ...
-# 111>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][             0][1-0]
-# 112>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][        e 0000][0-0] enum
-# 112>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][       82 0000][0-0]      e3
-# 112>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  1][0/0/0][      300 0000][0-0]         e31
-# 112>              COMMA|               NONE|     PARENT_NOT_SET[ 12/ 12/ 13/  0][0/0/0][   2 0000 0000][0-0]            ,
-# 112>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 17/  1][0/0/0][      108 0000][0-0]              e32
-# 112>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 17/ 17/ 18/  0][0/0/0][   2 0000 0000][0-0]                 ;
-# 112>            NEWLINE|               NONE|     PARENT_NOT_SET[ 18/ 18/  1/  0][0/0/0][             0][2-0]
-# 114>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 50/  0][0/0/0][             0][0-0] // enum class type : integral_type { ... } x, ...
-# 114>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][             0][1-0]
-# 115>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][        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>         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]                               ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 35/  1][1/1/0][     4008 0004][0-0]                                 b4
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/1/0][   2 4000 0004][0-0]                                   ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 39/  1][1/1/0][     4008 0004][0-0]                                     d4
-# 115>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 40/ 40/ 41/  1][0/0/0][   2 4000 0004][0-0]                                        }
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 42/ 42/ 45/  1][0/0/0][      70c 0000][0-0]                                          e41
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 45/ 46/  0][0/0/0][   2 0000 0000][0-0]                                             ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 47/ 47/ 50/  1][0/0/0][      508 0000][0-0]                                               e42
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  0][0/0/0][   2 0000 0000][0-0]                                                  ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 55/  1][0/0/0][      508 0000][0-0]                                                    e43
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 55/ 55/ 56/  0][0/0/0][   2 0000 0000][0-0]                                                       ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 57/ 57/ 60/  1][0/0/0][      508 0000][0-0]                                                         e44
-# 115>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 60/ 60/ 61/  0][0/0/0][   2 0000 0000][0-0]                                                            ;
-# 115>            NEWLINE|               NONE|     PARENT_NOT_SET[ 61/ 61/  1/  0][0/0/0][             0][2-0]
-# 117>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 43/  0][0/0/0][             0][0-0] // enum class type : integral_type { ... }
-# 117>            NEWLINE|               NONE|     PARENT_NOT_SET[ 43/ 43/  1/  0][0/0/0][             0][1-0]
-# 118>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][        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>         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]                                  ,
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 38/  1][1/1/0][     4008 0004][0-0]                                    b5
-# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 38/ 38/ 39/  0][1/1/0][   2 4000 0004][0-0]                                      ,
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 42/  1][1/1/0][     4008 0004][0-0]                                        d5
-# 118>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 43/ 43/ 44/  1][0/0/0][   2 4000 0004][0-0]                                           }
-# 118>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][   2 0000 0000][0-0]                                            ;
-# 118>            NEWLINE|               NONE|     PARENT_NOT_SET[ 45/ 45/  1/  0][0/0/0][             0][2-0]
-# 120>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 35/  0][0/0/0][             0][0-0] // enum class type : integral_type
-# 120>            NEWLINE|               NONE|     PARENT_NOT_SET[ 35/ 35/  1/  0][0/0/0][             0][1-0]
-# 121>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][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>          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
-# 123>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/0][             0][1-0]
-# 124>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000 000e 0000][0-0] enum
-# 124>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][1000 0002 0000][0-0]      class
-# 124>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][1000 0000 0000][0-0]            e7
-# 124>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][   2 0000 0000][0-0]              ;
-# 124>            NEWLINE|               NONE|     PARENT_NOT_SET[ 15/ 15/  1/  0][0/0/0][             0][2-0]
-# 126>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 39/  0][0/0/0][             0][0-0] // enum : integral_type { ... } x, ...
-# 126>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][             0][1-0]
-# 127>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][        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>         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]                      ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][1/1/0][     4008 0004][0-0]                        b8
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 26/ 26/ 27/  0][1/1/0][   2 4000 0004][0-0]                          ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  1][1/1/0][     4008 0004][0-0]                            c8
-# 127>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][   2 4000 0004][0-0]                               }
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 36/  1][0/0/0][      70c 0000][0-0]                                 e81
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/0/0][   2 0000 0000][0-0]                                    ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 38/ 38/ 41/  1][0/0/0][      508 0000][0-0]                                      e82
-# 127>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 41/ 41/ 42/  0][0/0/0][   2 0000 0000][0-0]                                         ;
-# 127>            NEWLINE|               NONE|     PARENT_NOT_SET[ 42/ 42/  1/  0][0/0/0][             0][2-0]
-# 129>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 23/  0][0/0/0][             0][0-0] // enum { ... } x, ...
-# 129>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][             0][1-0]
-# 130>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][        c 0000][0-0] enum
-# 130>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][   2 4000 0000][0-0]      {
-# 130>               WORD|               NONE|     PARENT_NOT_SET[  8/  8/ 10/  1][1/1/0][     400c 0004][0-0]        a9
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][1/1/0][   2 4000 0004][0-0]          ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 12/ 12/ 14/  1][1/1/0][     4008 0004][0-0]            b9
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 14/ 14/ 15/  0][1/1/0][   2 4000 0004][0-0]              ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 16/ 16/ 18/  1][1/1/0][     4008 0004][0-0]                c9
-# 130>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 19/ 19/ 20/  1][0/0/0][   2 4000 0004][0-0]                   }
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][      70c 0000][0-0]                     e91
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][   2 0000 0000][0-0]                        ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][      508 0000][0-0]                          e92
-# 130>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 29/ 29/ 30/  0][0/0/0][   2 0000 0000][0-0]                             ;
-# 130>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 30/  1/  0][0/0/0][             0][2-0]
-# 132>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][        e 0000][0-0] union
-# 132>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][        2 0000][0-0]       API_EXPORT
-# 132>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][       80 0000][0-0]                  u1
-# 132>         BRACE_OPEN|              UNION|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][   2 4000 0000][0-0]                     {
-# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 23/ 23/ 26/  1][1/1/0][     408e 0000][0-0]                       int
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][1/1/0][     4300 0000][0-0]                           x
-# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][   2 4000 0000][0-0]                            ;
-# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 30/ 30/ 34/  1][1/1/0][     408e 0000][0-0]                              long
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  1][1/1/0][     4300 0000][0-0]                                   y
-# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][1/1/0][   2 4000 0000][0-0]                                    ;
-# 132>        BRACE_CLOSE|              UNION|     PARENT_NOT_SET[ 38/ 38/ 39/  1][0/0/0][   2 4000 0000][0-0]                                      }
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 43/  1][0/0/0][      70c 0000][0-0]                                        u11
-# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][   2 0000 0000][0-0]                                           ,
-# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 45/ 45/ 46/  1][0/0/0][   2 0008 0000][0-0]                                             *
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  0][0/0/0][     2508 0000][0-0]                                              u12
-# 132>             ASSIGN|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  1][0/0/0][   2 0000 0000][0-0]                                                  =
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 59/  1][0/0/0][        8 0000][0-0]                                                    nullptr
-# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][   2 0000 0000][0-0]                                                           ,
-# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 61/ 61/ 62/  1][0/0/0][   2 0008 0000][0-0]                                                             *
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/0/0][     2508 0000][0-0]                                                              u13
-# 132>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][   2 4000 0000][0-0]                                                                 {
-# 132>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  0][1/1/0][     400c 0000][0-0]                                                                  0
-# 132>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][   2 4000 0000][0-0]                                                                   }
-# 132>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][   2 0000 0000][0-0]                                                                    ;
-# 132>            NEWLINE|               NONE|     PARENT_NOT_SET[ 69/ 69/  1/  0][0/0/0][             0][2-0]
-# 134>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][        e 0000][0-0] union
-# 134>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][        2 0000][0-0]       API_EXPORT
-# 134>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][       82 0000][0-0]                  u1
-# 134>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][      300 0000][0-0]                     u21
-# 134>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][   2 0000 0000][0-0]                        ;
-# 134>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 25/  1/  0][0/0/0][             0][1-0]
-# -=====-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/logger_cs_L_99.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/logger_cs_L_99.txt
deleted file mode 100644
index 7e7b6f8a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/logger_cs_L_99.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tokenize(): orig_line is , orig_col is , Text() '// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {}). May need special support, or perhaps there's a bug..', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
-tokenize(): orig_line is , orig_col is , Text() '// long comment line(s), such as here, might be too long to produce a correct LOG-file such as', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
-tokenize(): orig_line is , orig_col is , Text() '// with the use of option -L A', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
-tokenize(): orig_line is , orig_col is , Text() '// in such a case, the output of the log will be cut.', type is COMMENT_CPP, orig_col_end is 
-tokenize(): orig_line is , orig_col is , <Newline>, nl is 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/p.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/p.txt
deleted file mode 100644
index 88b242fb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/p.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-

-newlines                        = crlf

-# option(s) with 'not default' value: 1

-#

-# -=====-

-# number of loops               = 0
-# -=====-

-# language                      = CPP
-# -=====-

-# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp         Flag   Nl  Text

-#   1>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][   2 001c 0001][0-0] #

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

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

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

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

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

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

-#   2>              ARITH|               NONE|     PARENT_NOT_SET[ 16/  8/  9/  1][1/1/0][   2 0000 0001][0-0]                *

-#   2>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 10/ 17/  1][1/1/0][        8 0001][0-0]                  s16_bar

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

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

-#   4>             STRUCT|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][0/0/0][        e 0000][0-0] struct

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

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

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

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

-#   6>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  9/  1/ 14/  0][1/1/0][        c 0402][0-0]         TelegramIndex

-#   6>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 22/ 14/ 15/  0][1/1/0][   2 0000 0502][0-0]                      (

-#   6>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 23/ 15/ 20/  0][1/2/0][        a 0512][0-0]                       const

-#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 29/ 21/ 25/  1][1/2/0][       80 0512][0-0]                             char

-#   6>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 33/ 25/ 26/  0][1/2/0][   2 0000 0512][0-0]                                 *

-#   6>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 27/ 29/  1][1/2/0][      100 0512][0-0]                                   pN

-#   6>              COMMA|               NONE|     PARENT_NOT_SET[ 37/ 29/ 30/  0][1/2/0][   2 0000 0512][0-0]                                     ,

-#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 39/ 31/ 39/  1][1/2/0][       8a 0512][0-0]                                       unsigned

-#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 48/ 40/ 44/  1][1/2/0][       82 0512][0-0]                                                long

-#   6>               WORD|               NONE|     PARENT_NOT_SET[ 53/ 45/ 47/  1][1/2/0][      100 0512][0-0]                                                     nI

-#   6>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 55/ 47/ 48/  0][1/1/0][   2 0000 0512][0-0]                                                       )

-#   6>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  1][1/1/0][   2 0000 0502][0-0]                                                         :

-#   6>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  1/  0][1/1/0][             2][1-0]

-#   7>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 17/  1/  9/  0][1/1/0][        c 0502][0-0]                 pTelName

-#   7>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 25/  9/ 10/  0][1/1/0][   2 0000 0502][0-0]                         (

-#   7>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 10/ 12/  0][1/2/0][        8 0512][0-0]                          pN

-#   7>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 28/ 12/ 13/  0][1/1/0][   2 0000 0512][0-0]                            )

-#   7>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 13/ 14/  0][1/1/0][   2 0000 0502][0-0]                             ,

-#   7>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 14/  1/  0][1/1/0][             2][1-0]

-#   8>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 17/  1/ 10/  0][1/1/0][        8 0502][0-0]                 nTelIndex

-#   8>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 26/ 10/ 11/  0][1/1/0][   2 0000 0502][0-0]                          (

-#   8>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 11/ 12/  0][1/2/0][        8 0512][0-0]                           n

-#   8>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 28/ 12/ 13/  0][1/1/0][   2 0000 0512][0-0]                            )

-#   8>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 13/  1/  0][1/1/0][             2][1-0]

-#   9>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][   2 8000 0402][0-0]         {

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

-#  10>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][   2 8000 0402][0-0]         }

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

-#  12>         DESTRUCTOR|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][   2 000c 0402][0-0]         ~

-#  12>     FUNC_CLASS_DEF|         DESTRUCTOR|     PARENT_NOT_SET[ 10/  2/ 15/  0][1/1/0][        8 0402][0-0]          TelegramIndex

-#  12>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 23/ 15/ 16/  0][1/1/0][   2 0000 0502][0-0]                       (

-#  12>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 24/ 16/ 17/  0][1/1/0][   2 0000 0512][0-0]                        )

-#  12>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 17/  1/  0][1/1/0][             2][1-0]

-#  13>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][   2 8000 0402][0-0]         {

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

-#  14>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][   2 8000 0402][0-0]         }

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

-#  16>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  1/  6/  0][1/1/0][       8e 0402][0-0]         const

-#  16>               TYPE|               NONE|     PARENT_NOT_SET[ 15/  7/ 11/  1][1/1/0][       80 0402][0-0]               char

-#  16>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 19/ 11/ 12/  0][1/1/0][   2 0080 0402][0-0]                   *

-#  16>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 21/ 13/ 18/  1][1/1/0][       82 0402][0-0]                     const

-#  16>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 19/ 27/  1][1/1/0][      300 0402][0-0]                           pTelName

-#  16>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 35/ 27/ 28/  0][1/1/0][   2 0000 0402][0-0]                                   ;

-#  16>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 28/  1/  0][1/1/0][             2][1-0]

-#  17>               TYPE|               NONE|     PARENT_NOT_SET[  9/  1/  9/  0][1/1/0][       8e 0402][0-0]         unsigned

-#  17>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 14/  1][1/1/0][       82 0402][0-0]                  long

-#  17>               WORD|               NONE|     PARENT_NOT_SET[ 23/ 15/ 24/  1][1/1/0][      300 0402][0-0]                       nTelIndex

-#  17>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 32/ 24/ 25/  0][1/1/0][   2 0000 0402][0-0]                                ;

-#  17>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 25/  1/  0][1/1/0][             2][1-0]

-#  18>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][   2 0000 0402][0-0] }

-#  18>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][   2 0000 0000][0-0]  ;

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

-# -=====-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/replace.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/replace.txt
deleted file mode 100644
index ba5422dd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/replace.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-do_source_file(1507): Parsing: input/I-3310.c as language C
-do_source_file(1507): Parsing: input/backup.h as language C-Header
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3518.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3518.cfg
deleted file mode 100644
index 6e8afc35..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3518.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_var_def_blk = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_090.cfg
deleted file mode 100644
index eba1ab79..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_090.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_columns                  = 3
-align_nl_cont                   = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2703.cfg
deleted file mode 100644
index 80c42da9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2703.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-indent_columns           = 4
-indent_with_tabs         = 0
-#Whether to align variable definitions in prototypes and functions.
-align_func_params        = true
-#The span for aligning parameter definitions in function on parameter name.
-#  0: Don't align (default).
-align_func_params_span   = 1
-sp_after_byref           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-f.cfg
deleted file mode 100644
index e74d7570..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_ellipsis_parameter_pack = force
-nl_collapse_empty_body     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-i.cfg
deleted file mode 100644
index dd286b9d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-i.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_ellipsis_parameter_pack = ignore
-nl_collapse_empty_body     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-r.cfg
deleted file mode 100644
index 771903f1..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_ellipsis_parameter_pack = remove
-nl_collapse_empty_body     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align-330.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align-330.cfg
deleted file mode 100644
index 7a2ce116..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align-330.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_after_comma         = force
-indent_columns         = 3
-nl_class_colon         = force
-align_nl_cont          = true
-align_pp_define_gap    = 4
-align_pp_define_span   = 3
-indent_with_tabs       = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_012.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_012.cfg
deleted file mode 100644
index 805f96ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_012.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_arith             = force
-sp_before_ptr_star   = force
-sp_after_ptr_star    = remove
-sp_before_byref      = remove
-sp_before_byref_func = remove
-sp_inside_angle      = remove
-sp_after_angle       = force
-sp_angle_word        = force
-indent_columns       = 3
-indent_class         = true
-indent_access_spec   = 2
-nl_func_var_def_blk  = 1
-nl_fdef_brace        = add
-mod_paren_on_return  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1516.cfg
deleted file mode 100644
index e6c98a53..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1516.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_func_var_def_blk  = 2
-nl_var_def_blk_start = 1
-nl_var_def_blk_end   = 2
-nl_var_def_blk_in    = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
deleted file mode 100644
index 7aac9635..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-nl_fdef_brace                   = remove
-nl_collapse_empty_body          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_var_def_blk-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_var_def_blk-1.cfg
deleted file mode 100644
index 2fc79eb3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_var_def_blk-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_func_var_def_blk             = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_call_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_call_empty.cfg
deleted file mode 100644
index e6d960bb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_call_empty.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-sp_before_byref          = remove
-sp_before_byref_func     = remove
-sp_after_comma           = force
-sp_func_call_paren       = force
-sp_func_call_paren_empty = remove
-sp_return_paren          = remove
-indent_columns           = 3
-nl_func_var_def_blk      = 1
-nl_fcall_brace           = add
-nl_fdef_brace            = add
-align_func_params        = true
-align_var_def_star_style = 1
-mod_paren_on_return      = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_class_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_class_empty.cfg
deleted file mode 100644
index eb4aa154..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_class_empty.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_byref           = remove
-sp_before_byref_func      = remove
-sp_after_comma            = force
-sp_func_call_paren        = force
-sp_func_call_paren_empty  = remove
-sp_func_class_paren_empty = force
-sp_return_paren           = remove
-indent_columns            = 3
-nl_func_var_def_blk       = 1
-nl_fcall_brace            = add
-nl_fdef_brace             = add
-align_func_params         = true
-align_var_def_star_style  = 1
-mod_paren_on_return       = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_def_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_def_empty.cfg
deleted file mode 100644
index bb1260ab..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_def_empty.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_byref          = remove
-sp_before_byref_func     = remove
-sp_after_comma           = force
-sp_func_def_paren_empty  = force
-sp_func_call_paren       = force
-sp_func_call_paren_empty = remove
-sp_return_paren          = remove
-indent_columns           = 3
-nl_func_var_def_blk      = 1
-nl_fcall_brace           = add
-nl_fdef_brace            = add
-align_func_params        = true
-align_var_def_star_style = 1
-mod_paren_on_return      = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_proto_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_proto_empty.cfg
deleted file mode 100644
index e6da9e5f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_proto_empty.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-sp_before_byref           = remove
-sp_before_byref_func      = remove
-sp_after_comma            = force
-sp_func_proto_paren_empty = force
-sp_func_call_paren        = force
-sp_func_call_paren_empty  = remove
-sp_return_paren           = remove
-indent_columns            = 3
-nl_func_var_def_blk       = 1
-nl_fcall_brace            = add
-nl_fdef_brace             = add
-align_func_params         = true
-align_var_def_star_style  = 1
-mod_paren_on_return       = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_045.cfg
deleted file mode 100644
index 3ff68ef5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_045.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-sp_assign           = force
-indent_columns      = 3
-indent_with_tabs    = 0
-indent_class        = true
-nl_func_var_def_blk = 1
-# Add or remove space around the '.' or '-&gt;' operators. Default=Remove.
-sp_member           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00094-Issue_3457.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00094-Issue_3457.c
deleted file mode 100644
index d8baf3c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00094-Issue_3457.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#define IS_UNSIGNED(t) \
-	_Generic((t), \
-	         uint8_t: true, \
-	         uint16_t: true, \
-	         uint32_t: true, \
-	         uint64_t: true, \
-	         unsigned long long: true, \
-	         int8_t: false, \
-	         int16_t: false, \
-	         int32_t: false, \
-	         int64_t: false, \
-	         signed long long: false)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34148-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34148-bug_1139.cpp
deleted file mode 100644
index d6d8a484..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34148-bug_1139.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-void a()
-{
-	if((tmp == nullptr) ||
-	   ((tmp->type != CT_NUMBER) &&
-	    (tmp->type != CT_SIZEOF) &&
-	    !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	   (tmp->type == CT_NEWLINE)
-	   )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-	else if ((tmp == nullptr) ||
-	         ((tmp->type != CT_NUMBER) &&
-	          (tmp->type != CT_SIZEOF) &&
-	          !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	         (tmp->type == CT_NEWLINE)
-	         )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE)
-	                    )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE)
-	                    )
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34149-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34149-bug_1139.cpp
deleted file mode 100644
index dd0a10dc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34149-bug_1139.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-void a()
-{
-	if((tmp == nullptr) ||
-	   ((tmp->type != CT_NUMBER) &&
-	    (tmp->type != CT_SIZEOF) &&
-	    !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	   (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-	else if ((tmp == nullptr) ||
-	         ((tmp->type != CT_NUMBER) &&
-	          (tmp->type != CT_SIZEOF) &&
-	          !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	         (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-
-	if                 ((tmp == nullptr) ||
-	                    ((tmp->type != CT_NUMBER) &&
-	                     (tmp->type != CT_SIZEOF) &&
-	                     !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-	                    (tmp->type == CT_NEWLINE))
-	{
-		set_chunk_type(next, CT_LABEL_COLON);
-	}
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cfg
deleted file mode 100644
index 955a1f9a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-output_tab_size                 = 4
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_cmt_with_tabs            = false
-indent_class_on_colon           = true
-indent_constr_colon             = true
-indent_relative_single_line_comments = true
-indent_access_spec_body         = true
-nl_func_leave_one_liners        = true
-nl_end_of_file                  = force
-nl_end_of_file_min              = 4
-nl_before_opening_brace_func_class_def = force
-nl_class_colon                  = add
-pos_class_colon                 = lead
-align_var_class_span            = 3
-align_var_struct_span           = 3
-pp_if_indent_code               = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1139.cpp
deleted file mode 100644
index 47463232..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1139.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-void a()
-{
-               if((tmp == nullptr) ||
-                        ((tmp->type != CT_NUMBER) &&
-                         (tmp->type != CT_SIZEOF) &&
-                         !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-                        (tmp->type == CT_NEWLINE)
-                        )
-               {
-                  set_chunk_type(next, CT_LABEL_COLON);
-               }
-else if ((tmp == nullptr) ||
-                        ((tmp->type != CT_NUMBER) &&
-                         (tmp->type != CT_SIZEOF) &&
-                         !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-                        (tmp->type == CT_NEWLINE)
-                        )
-               {
-                  set_chunk_type(next, CT_LABEL_COLON);
-               }
-
-
-   if                 ((tmp == nullptr) ||
-       ((tmp->type != CT_NUMBER) &&
-        (tmp->type != CT_SIZEOF) &&
-        !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-          (tmp->type == CT_NEWLINE))
-   {
-      set_chunk_type(next, CT_LABEL_COLON);
-   }
-
-   if                 ((tmp == nullptr) ||
-       ((tmp->type != CT_NUMBER) &&
-        (tmp->type != CT_SIZEOF) &&
-        !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
-          (tmp->type == CT_NEWLINE)
-
-)
-   {
-      set_chunk_type(next, CT_LABEL_COLON);
-   }
-}
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
new file mode 100644
index 00000000..6870c142
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0.orig.tar.gz
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.editorconfig
index 3942fe21..05c9fc6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.editorconfig
@@ -1,3 +1,3 @@
-[{src}/*]
+[src/*]
 indent_style = space
 indent_size = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitattributes b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitattributes
index 5ef989a3..5ef989a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitattributes
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitattributes
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/ISSUE_TEMPLATE b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.github/ISSUE_TEMPLATE
index d98e5cf5..d98e5cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/ISSUE_TEMPLATE
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/.github/workflows/uncrustify_test.yml
new file mode 100644
index 00000000..00e972ff
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.github/workflows/uncrustify_test.yml
@@ -0,0 +1,30 @@
+name: uncrustify_test
+on: [push, pull_request]
+
+# Cancel any in-progress CI runs for a PR if it is updated
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  uncrustify:
+    name: ${{ matrix.build_type }} - ${{ matrix.generator }}
+    strategy:
+      matrix:
+        include:
+          - build_type: Debug
+            generator: Ninja
+          - build_type: Release
+            generator: Unix Makefiles
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - name: cmake-part-and-tests
+        env:
+          BADGE: linux
+        run: |
+          cmake -B build -G "${{ matrix.generator }}" -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          cmake --build build
+          cd build
+          ../scripts/run_ctest.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitignore b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitignore
index c4c9b54b..098b0695 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitignore
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitignore
@@ -4,6 +4,9 @@
 # PyCharm help directory
 venv/
 
+# PyCharm .run directory
+.run/
+
 # Compiled Python code
 *.pyc
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.travis.yml
index a3bfcf7a..a3bfcf7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.travis.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/AUTHORS b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/AUTHORS
index e4d72680..6c01a700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/AUTHORS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/AUTHORS
@@ -3,9 +3,10 @@ Author:
 
 Maintenance:
 Guy Maurel
+Michele Calgaro
 Matthew Woehlke
 
-until 2020-11-05:
+until 2022-11-22:
 Other collaborators:
 Alan Fineberg
 Alexander GQ Gerasiov
@@ -31,6 +32,7 @@ B. Kevin Hardman
 Bogdan Popescu
 Brandon Slack
 Brendan Long
+Brian Kelley
 CharlieYJH
 Chris Lalancette
 Clemens Rabe
@@ -60,6 +62,7 @@ Emmanuel Christophe
 epac-tom
 Ethan Gao
 Florin Pop
+Frank J. T. Wojcik
 Gary Ash
 Ger Hobbelt
 Hackerpilot
@@ -79,7 +82,7 @@ Jeremy H
 Jeremy T Hilliker
 Jim Meyering
 Jiri Hruska
-jodi.the.tigger
+jodi.the.tigger@gmail.com
 Jody Hagins
 Joel Ostraat
 Joergen Ibsen
@@ -90,6 +93,7 @@ Joshua Parker
 Julian Picht
 Kalle Raiskila
 Keepun
+Kevin Wong
 krys
 Laurent Tréguier
 Lauri Kasanen
@@ -99,6 +103,7 @@ Lorenz Haas
 Lykurg
 Maciej Bogusz
 Marco Stephan
+Marcus Nilsson
 Marek Fort
 Marius Zwicker
 Mark Stegeman
@@ -135,12 +140,14 @@ Peter Bruin
 Peter Hartley
 Peter Jonas
 Peter Kolbus
+Peter Tao
 Peter Waller
 Piet Van Reepingen
 PMheart
 Randolph R. Settgast
 Randolph Settgast
 RaveTheTadpole
+Ray Strode
 Richard Maxwell
 Ricky Lopez
 Roland Schulz
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/BUGS b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/BUGS
index a6e2ccaa..a6e2ccaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/BUGS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/BUGS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CMakeLists.txt
index 8c8a59ef..2e288f01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CMakeLists.txt
@@ -138,7 +138,7 @@ endif()
 # Generate uncrustify_version.h
 #
 
-set(UNCRUSTIFY_VERSION "0.75.0_f")
+set(UNCRUSTIFY_VERSION "0.76.0_f")
 
 option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
 if(NoGitVersionString)
@@ -269,6 +269,7 @@ set(uncrustify_sources
   src/brace_cleanup.cpp
   src/braces.cpp
   src/calculate_closing_brace_position.cpp
+  src/change_int_types.cpp
   src/chunk.cpp
   src/ChunkStack.cpp
   src/combine.cpp
@@ -294,6 +295,7 @@ set(uncrustify_sources
   src/logger.cpp
   src/logmask.cpp
   src/log_rules.cpp
+  src/mark_question_colon.cpp
   src/md5.cpp
   src/newlines.cpp
   src/option.cpp
@@ -303,11 +305,13 @@ set(uncrustify_sources
   src/parens.cpp
   src/parent_for_pp.cpp
   src/ParseFrame.cpp
+  src/pragma_cleanup.cpp
   src/pcf_flags.cpp
   src/punctuators.cpp
   src/quick_align_again.cpp
   src/remove_duplicate_include.cpp
   src/remove_extra_returns.cpp
+  src/rewrite_infinite_loops.cpp
   src/semicolons.cpp
   src/sorting.cpp
   src/space.cpp
@@ -316,6 +320,7 @@ set(uncrustify_sources
   src/uncrustify.cpp
   src/uncrustify_emscripten.cpp
   src/uncrustify_types.cpp
+  src/unc_ctype.cpp
   src/unc_text.cpp
   src/unc_tools.cpp
   src/unicode.cpp
@@ -357,6 +362,7 @@ set(uncrustify_headers
   src/brace_cleanup.h
   src/braces.h
   src/calculate_closing_brace_position.h
+  src/change_int_types.h
   src/char_table.h
   src/chunk.h
   src/ChunkStack.h
@@ -384,6 +390,7 @@ set(uncrustify_headers
   src/log_levels.h
   src/logmask.h
   src/log_rules.h
+  src/mark_question_colon.h
   src/md5.h
   src/newlines.h
   src/option.h
@@ -394,12 +401,14 @@ set(uncrustify_headers
   src/parens.h
   src/parent_for_pp.h
   src/ParseFrame.h
+  src/pragma_cleanup.h
   src/pcf_flags.h
   src/prototypes.h
   src/punctuators.h
   src/quick_align_again.h
   src/remove_duplicate_include.h
   src/remove_extra_returns.h
+  src/rewrite_infinite_loops.h
   src/semicolons.h
   src/sorting.h
   src/space.h
@@ -433,23 +442,9 @@ set(uncrustify_docs
 add_executable(uncrustify ${uncrustify_sources} ${uncrustify_headers})
 add_dependencies(uncrustify generate_version_header)
 
-if(CMAKE_VERSION VERSION_LESS 2.8.10)
-  if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-    # Multi-configuration or build type set
-    set_property(TARGET uncrustify APPEND PROPERTY
-      COMPILE_DEFINITIONS_DEBUG DEBUG
-    )
-  else()
-    # Single-configuration with no build type set
-    set_property(TARGET uncrustify APPEND PROPERTY
-      COMPILE_DEFINITIONS DEBUG
-    )
-  endif()
-else()
-  set_property(TARGET uncrustify APPEND PROPERTY
-    COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
-  )
-endif()
+set_property(TARGET uncrustify APPEND PROPERTY
+  COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
+)
 
 #
 # Generate uncrustify.1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CODEOWNERS b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CODEOWNERS
new file mode 100644
index 00000000..c29e4a1f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CODEOWNERS
@@ -0,0 +1 @@
+*               @gmaurel @mwoehlke-kitware @micheleCTDEAdmin
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CONTRIBUTING.md b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CONTRIBUTING.md
index 8a43f8a8..8a43f8a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CONTRIBUTING.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CONTRIBUTING.md
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/COPYING b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/COPYING
index d60c31a9..d60c31a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/COPYING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/COPYING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/ChangeLog b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/ChangeLog
index 0e456e37..6f9294b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/ChangeLog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/ChangeLog
@@ -1,3 +1,47 @@
+Change highlights in uncrustify-0.76.0 (November 2022)
+-------------------------------------------------------------------------------
+   1aea3d1fcb55dc2ca40dfe2b1d548685a415ef3a
+     Added   : nl_collapse_empty_body_functions     Apr 29 2022
+   c7f5df072f56bb0e3a9b897e16b8e5fc283f3bcf
+     Added   : set_numbering_for_html_output        May 29 2022
+   92e4a36a5a78d9af523008aeb71e7acfe199269a
+     Added   : mod_infinite_loop                    Jun 22 2022
+   6e807bcec01382b164562c8ae5939d2b5ee76877
+     Added   : mod_short_int                        Jun 28 2022
+     Added   : mod_long_int                         Jun 28 2022
+     Added   : mod_unsigned_int                     Jun 28 2022
+     Added   : mod_signed_int                       Jun 28 2022
+   baad5db83faf5fb771cea8898760ad582227ccda
+     Added   : mod_int_prefer_int_on_left           Jul  6 2022
+     Added   : mod_int_long                         Jul  6 2022
+     Added   : mod_int_signed                       Jul  6 2022
+     Added   : mod_int_unsigned                     Jul  6 2022
+     Added   : mod_int_short                        Jul  6 2022
+   e6a5458d32ca26c8b7d24f514115ebc36fce2348
+     Added   : nl_oc_msg_args_min_params            Jul  9 2022
+   862369a315763ce1286732da3713414cd2533227
+     Added   : pp_space_after                       Jul 14 2022
+     Added   : pp_space_before                      Jul 14 2022
+     Removed : pp_space                             Jul 14 2022
+   be0d1664f901d1cbfa7bf7697a883adf4b709444
+     Added   : nl_throw_expr                        Jul 19 2022
+     Added   : mod_paren_on_throw                   Jul 19 2022
+   9e65feefa2d66c5d08049e53468cae682f66800d
+     Added   : debug_sort_the_tracks                Aug  2 2022
+   b58f1298a3ddcd256ecb0688f6b18ca7c623f594
+     Removed : pp_space_before                      Aug  6 2022
+   a31e5c100de768b4fec45a3e1c2d1e008824b2c6
+     Added   : nl_var_def_blk_end_func_top          Aug 11 2022
+     Removed : nl_func_var_def_blk                  Aug 11 2022
+   56e2159b29c372ebd1e240d427c842b5bb0b2147
+     Added   : pp_indent_with_tabs                  Sep  6 2022
+   35075d50967014dd7127640d2505bca5dc21dfe5
+     Added   : pp_multiline_define_body_indent      Sep 15 2022
+   5b88110f5bb685a9b298b247207e32c305366d18
+     Added   : nl_oc_msg_args_max_code_width        Sep 20 2022
+   0c8e5e827d3b5a007247ef3d5ed937cf18378680
+     Added   : debug_decode_the_flags               Oct  9 2022
+
 Change highlights in uncrustify-0.75.0 (May 2022)
 -------------------------------------------------------------------------------
   52131d9fa22fd0c655ae2510563ff85306d4bd27
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/Comments.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/Comments.txt
new file mode 100644
index 00000000..b4696a3e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/Comments.txt
@@ -0,0 +1,26 @@
+2016-04-25
+
+While a line is indented, the comment at the end of the line stays at the original column.
+
+If we have:
+      else if ((pc->GetType() == CT_FUNC_CLASS_DEF) ||
+               (pc->GetType() == CT_FUNC_DEF) ||
+               (pc->GetType() == CT_FUNC_CLASS_PROTO) ||
+               (pc->GetType() == CT_FUNC_PROTO))
+      {                  // guy 2016-04-16
+
+where the brace { is at new line with a comment.
+The option nl_elseif_brace = remove
+gives:
+      else if ((pc->GetType() == CT_FUNC_CLASS_DEF) ||
+                 (pc->GetType() == CT_FUNC_DEF) ||
+                 (pc->GetType() == CT_FUNC_CLASS_PROTO) ||
+                 (pc->GetType() == CT_FUNC_PROTO)) { // guy 2016-04-16
+If using at new the same option again with a new value
+nl_elseif_brace = add
+is not able to reconstruct the original source. The comment has changed the line:
+      else if ((pc->GetType() == CT_FUNC_CLASS_DEF) ||
+               (pc->GetType() == CT_FUNC_DEF) ||
+               (pc->GetType() == CT_FUNC_CLASS_PROTO) ||
+               (pc->GetType() == CT_FUNC_PROTO))       // guy 2016-04-16
+      {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/HELP b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/HELP
index 83792fa5..83792fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/HELP
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/HELP
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/LIMITATIONS.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/LIMITATIONS.txt
index a49f23f2..a49f23f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/LIMITATIONS.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/LIMITATIONS.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/NEWS b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/NEWS
index 8b6344a0..8b6344a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/NEWS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/NEWS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/README.md
index 85fc2bd2..08d3fd43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/README.md
@@ -5,10 +5,10 @@
 ---------------------------
 
 # Uncrustify
-A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA
+A source code beautifier for C, C++, C#, Objective-C, D, Java, Pawn and Vala.
 
 ## Features
-* Highly configurable - 808 configurable options as of version 0.75.0
+* Highly configurable - 828 configurable options as of version 0.76.0
 - <details><summary>add/remove spaces</summary>
 
   - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._
@@ -66,22 +66,22 @@ Pre compiled binaries for Windows can be downloaded [here](https://sourceforge.n
 [CMake](https://cmake.org/) is a tool that generates build systems
 (Makefiles, Visual Studio project files, Xcode project files and others).
 
-To generate a build system for Uncrustify using CMake, create a build
-folder and run CMake from it:
+To generate a build system for Uncrustify using CMake on UNIX-like systems, create a
+build folder and run CMake from it, making sure to specify Release mode:
 
 ```bash
 $ mkdir build
 $ cd build
-$ cmake ..
+$ cmake -DCMAKE_BUILD_TYPE=Release ..
 ```
-(Use `cmake -G Xcode ..` for Xcode)
+Other systems may require other flags (e.g. `cmake -G Xcode ..` for Xcode).
 
 Then use the build tools of your build system (in many cases this will
 simply be `make`, but on Windows it could be MSBuild or Visual Studio).
 Or use CMake to invoke it:
 
 ```bash
-$ cmake --build .
+$ cmake --build . --config Release
 ```
 
 If testing is enabled, CMake generates a `test` target, which you can
@@ -101,12 +101,17 @@ build type when running CMake (by setting the `CMAKE_BUILD_TYPE`
 variable), and the generated files then build that configuration.
 
 An example of a single-configuration build system are Makefiles. You can
-build the Release configuration of Uncrustify (from the build folder) with:
+build the Release or Debug configurations of Uncrustify (from the build folder) with:
 
 ```bash
 $ cmake -DCMAKE_BUILD_TYPE=Release ..
 $ make
 ```
+or
+```bash
+$ cmake -DCMAKE_BUILD_TYPE=Debug ..
+$ make
+```
 
 Other build systems are multi-configuration, which means you specify the
 build type when building.
@@ -114,7 +119,7 @@ build type when building.
 An example of a multi-configuration build system are Visual Studios project
 files. When you open the project in Visual Studio, you can select which
 configuration to build. You can also do this while building from the
-command line with `cmake --build . --config Release`.
+command line with `cmake --build . --config Debug`.
 
 
 ## Bugs
@@ -210,9 +215,9 @@ The p-file gives you details of the parsing process and indentation.
 The A-file gives you many details about the run itself, where the process is running thru,
 which values have the most important variables.
 ```.txt
-tokenize(2351): orig_line is 1, orig_col is 1, Text() 'class', type is CLASS, orig_col_end is 6
-tokenize(2351): orig_line is 1, orig_col is 7, Text() 'Capteur', type is WORD, orig_col_end is 14
-tokenize(2351): orig_line is 1, orig_col is 15, Text() '{', type is BRACE_OPEN, orig_col_end is 16
+tokenize(2351): orig line is 1, orig col is 1, Text() 'class', type is CLASS, orig col_end is 6
+tokenize(2351): orig line is 1, orig col is 7, Text() 'Capteur', type is WORD, orig col_end is 14
+tokenize(2351): orig line is 1, orig col is 15, Text() '{', type is BRACE_OPEN, orig col_end is 16
 ```
 
 You can also dump the parsing information of each formatting step using the 'dump steps' option.
@@ -275,7 +280,7 @@ sp_trailing_ret_t;
 ```
 - Insert the code below to the file src/space.cpp
 ```.cpp
-   if (chunk_is_token(first, CT_TRAILING_RET_T))
+   if (first->Is(CT_TRAILING_RET_T))
    {
       // Add or remove space around trailing return operator '->'.
       log_rule("sp_trailing_ret_t");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/TESTING b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/TESTING
index 63efbff7..63efbff7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/TESTING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/TESTING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/appveyor.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/appveyor.yml
index 1bdd8d4c..1bdd8d4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/appveyor.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/appveyor.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/CodeCoverage.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/CodeCoverage.cmake
index 670c5144..670c5144 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/CodeCoverage.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/CodeCoverage.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateTokenNames.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/GenerateTokenNames.cmake
index 02a6241a..02a6241a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateTokenNames.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/GenerateTokenNames.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateVersionHeader.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/GenerateVersionHeader.cmake
index 3d6d376b..3d6d376b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateVersionHeader.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/cmake/Toolchain-mingw32.cmake
new file mode 100644
index 00000000..c220975c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw32.cmake
@@ -0,0 +1,19 @@
+#
+# Toolchain file for cross-compiling from Linux to Win32 using MinGW
+#
+
+set(CMAKE_SYSTEM_NAME Windows)
+
+if(NOT COMPILER_PREFIX)
+  if(EXISTS /usr/i586-mingw32msvc)
+    # mingw
+    set(COMPILER_PREFIX "i586-mingw32msvc")
+  else()
+    # default to mingw-w64
+    set(COMPILER_PREFIX "i686-w64-mingw32")
+  endif()
+endif()
+
+find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
+find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw64.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw64.cmake
new file mode 100644
index 00000000..bc1a666e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw64.cmake
@@ -0,0 +1,19 @@
+#
+# Toolchain file for cross-compiling from Linux to Win64 using MinGW
+#
+
+set(CMAKE_SYSTEM_NAME Windows)
+
+if(NOT COMPILER_PREFIX)
+  if(EXISTS /usr/amd64-mingw32msvc-gcc)
+    # mingw
+    set(COMPILER_PREFIX "amd64-mingw32msvc-gcc")
+  else()
+    # default to mingw-w64
+    set(COMPILER_PREFIX "x86_64-w64-mingw32")
+  endif()
+endif()
+
+find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
+find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/uninstall.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/uninstall.cmake
index b9618a29..b9618a29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/uninstall.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/uninstall.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/commit.log b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/commit.log
index 1a725f4e..1a725f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/commit.log
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/commit.log
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.sh
index e52a3594..e52a3594 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.travis.yml
index ef306e8c..ef306e8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.travis.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/debian-tde.mk b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/debian-tde.mk
index f36e3527..f36e3527 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/debian-tde.mk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/debian-tde.mk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/versions.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/versions.pl
index 1b110f7a..1b110f7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/versions.pl
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/versions.pl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/changelog
index 40d2a1f0..24a63b55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/changelog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/changelog
@@ -1,3 +1,9 @@
+uncrustify-trinity (0.76.0-0debian12.0.0+0) unstable; urgency=medium
+
+  * TDE version of upstream 0.76.0
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 04 Dec 2022 18:56:43 +0900
+
 uncrustify-trinity (0.75.0-0debian11.0.0+0) unstable; urgency=medium
 
   * TDE version of upstream 0.75.0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/compat b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/compat
index ec635144..ec635144 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/compat
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/compat
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/control b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/control
index 21e39cb0..21e39cb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/control
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/control
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/copyright b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/copyright
index 7c74f673..7c74f673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/copyright
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/copyright
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/docs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/docs
index 3310d30d..3310d30d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/docs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/docs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/001_docs-remove-remote-images.patch b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/001_docs-remove-remote-images.patch
index 9c7d3e3b..9c7d3e3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/001_docs-remove-remote-images.patch
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/001_docs-remove-remote-images.patch
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/002_trinity_customization.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/002_trinity_customization.diff
index c447cc39..4a070a0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/002_trinity_customization.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/002_trinity_customization.diff
@@ -18,7 +18,7 @@ Customize and repackage as a TDE package.
    src/align_add.cpp
    src/align_asm_colon.cpp
    src/align_assign.cpp
-@@ -325,7 +325,7 @@
+@@ -330,7 +330,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
-@@ -421,7 +421,7 @@
+@@ -430,7 +430,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"
-@@ -430,31 +430,31 @@
+@@ -439,17 +439,17 @@
    "${PROJECT_SOURCE_DIR}/README.md"
  )
  
@@ -45,26 +45,10 @@ Customize and repackage as a TDE package.
 +add_executable(uncrustify-trinity ${uncrustify-trinity_sources} ${uncrustify-trinity_headers})
 +add_dependencies(uncrustify-trinity generate_version_header)
  
- if(CMAKE_VERSION VERSION_LESS 2.8.10)
-   if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-     # Multi-configuration or build type set
--    set_property(TARGET uncrustify APPEND PROPERTY
-+    set_property(TARGET uncrustify-trinity APPEND PROPERTY
-       COMPILE_DEFINITIONS_DEBUG DEBUG
-     )
-   else()
-     # Single-configuration with no build type set
--    set_property(TARGET uncrustify APPEND PROPERTY
-+    set_property(TARGET uncrustify-trinity APPEND PROPERTY
-       COMPILE_DEFINITIONS DEBUG
-     )
-   endif()
- else()
--  set_property(TARGET uncrustify APPEND PROPERTY
-+  set_property(TARGET uncrustify-trinity APPEND PROPERTY
-     COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
-   )
- endif()
+-set_property(TARGET uncrustify APPEND PROPERTY
++set_property(TARGET uncrustify-trinity APPEND PROPERTY
+   COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG>
+ )
  
  #
 -# Generate uncrustify.1
@@ -75,7 +59,7 @@ Customize and repackage as a TDE package.
  
  #
  # Generate uncrustify.xml (katepart highlighting file)
-@@ -476,7 +476,7 @@
+@@ -471,7 +471,7 @@
  #
  OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
  if(ENABLE_CODECOVERAGE)
@@ -84,7 +68,7 @@ Customize and repackage as a TDE package.
      include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
  endif(ENABLE_CODECOVERAGE)
  
-@@ -484,10 +484,10 @@
+@@ -479,10 +479,10 @@
  # Build command to run uncrustify on its own sources
  #
  add_custom_target(format-sources)
@@ -97,7 +81,7 @@ Customize and repackage as a TDE package.
        -c forUncrustifySources.cfg
        -lCPP --no-backup ${source}
      COMMENT "Formatting ${source}"
-@@ -499,7 +499,7 @@
+@@ -494,7 +494,7 @@
  #
  # Package
  #
@@ -106,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")
-@@ -517,8 +517,8 @@
+@@ -512,8 +512,8 @@
  # Install
  #
  if(MSVC)
@@ -117,7 +101,7 @@ Customize and repackage as a TDE package.
      DESTINATION "."
    )
    install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
-@@ -530,17 +530,17 @@
+@@ -525,17 +525,17 @@
    )
  else()
    include(GNUInstallDirs)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/003_allow_older_distributions.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/003_allow_older_distributions.diff
index 8643a7cd..8643a7cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/003_allow_older_distributions.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/003_allow_older_distributions.diff
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/004_fixed_usage.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/004_fixed_usage.diff
index 3f2c57ff..b23b40e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/004_fixed_usage.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/004_fixed_usage.diff
@@ -1,7 +1,7 @@
 Fixed usage message to match uncrustify-trinity.
 --- a/src/uncrustify.cpp
 +++ b/src/uncrustify.cpp
-@@ -304,15 +304,15 @@
+@@ -307,15 +307,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
-@@ -65,15 +65,15 @@
+@@ -66,15 +66,15 @@
                           Cannot be used with the -o option'
  
  Usage Examples
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/series
index 383a9d11..383a9d11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/series
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/series
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/rules
index dd013fa1..dd013fa1 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/rules
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/rules
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/format b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/format
index 163aaf8d..163aaf8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/format
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/format
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/options b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/options
index d71748bb..d71748bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/options
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/options
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Track.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Track.jpg
index b18b0477..b18b0477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Track.jpg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Track.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Tracking.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Tracking.txt
index a1fb7850..fc101eba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Tracking.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Tracking.txt
@@ -10,7 +10,7 @@ The command option is:
 uncrustify --tracking Track.html -c config-FILE -f source-FILE -L A 2>A.txt
 
 Tracking puts a red "M" in the source to show where the options are working.
-A tracking number is used and writen in the Track.html file and the output file A.txt
+A tracking number is used and written in the Track.html file and the output file A.txt
 to make possible to link the changes together.
 
 An example:
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/align-thresholds.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/align-thresholds.txt
index 5c18039d..5c18039d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/align-thresholds.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/align-thresholds.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/control_the_spaces.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/control_the_spaces.txt
index 8ea2ac52..8ea2ac52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/control_the_spaces.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/control_the_spaces.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/dump-steps.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/dump-steps.txt
index 498a147e..498a147e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/dump-steps.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/dump-steps.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/goals.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/goals.txt
index 610ec121..610ec121 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/goals.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/goals.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/how_to_configure_options.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_configure_options.txt
index 2f0eee4e..2f0eee4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/how_to_configure_options.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_configure_options.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/how_to_format_cpp_lambda_functions.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_format_cpp_lambda_functions.rst
index e15776d4..e15776d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/how_to_format_cpp_lambda_functions.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_format_cpp_lambda_functions.rst
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/align_typedef.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/align_typedef.html
index 6d94eadf..6d94eadf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/align_typedef.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/align_typedef.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/ben.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/ben.cfg.txt
index 5b19c7ca..201e8a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/ben.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/ben.cfg.txt
@@ -32,7 +32,7 @@ nl_for_brace			= add		# "for () {" vs "for () \n {"
 nl_else_brace			= add		# "else {" vs "else \n {"
 nl_while_brace			= add		# "while () {" vs "while () \n {"
 nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
+nl_var_def_blk_end_func_top	= 1
 nl_before_case			= 1
 nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
 nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/config.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/config.txt
index 571f4038..7c523470 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/config.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/config.txt
@@ -1,4 +1,4 @@
-# Uncrustify-0.75.0
+# Uncrustify-0.76.0
 
 #
 # General options
@@ -447,15 +447,15 @@ sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 # Default: remove
 sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
 sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
+# (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
 sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
 sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
@@ -995,7 +995,7 @@ sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between ')' and type in 'new(foo) BAR'.
 sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space inside parenthesis of the new operator
+# Add or remove space inside parentheses of the new operator
 # as in 'new(foo) BAR'.
 sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
 
@@ -1537,7 +1537,7 @@ indent_using_block              = true     # true/false
 # How to indent the continuation of ternary operator.
 #
 # 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
+# 1: When the `if_false` is a continuation, indent it under the `if_true` branch
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
@@ -1565,10 +1565,15 @@ donot_indent_func_def_close_paren = false    # true/false
 # Newline adding and removing options
 #
 
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
+# Whether to collapse empty blocks between '{' and '}' except for functions.
+# Use nl_collapse_empty_body_functions to specify how empty function braces
+# should be formatted.
 nl_collapse_empty_body          = false    # true/false
 
+# Whether to collapse empty blocks between '{' and '}' for functions only.
+# If true, overrides nl_inside_empty_func.
+nl_collapse_empty_body_functions = false    # true/false
+
 # Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
 nl_assign_leave_one_liners      = false    # true/false
 
@@ -2021,6 +2026,12 @@ nl_template_end                 = false    # true/false
 # See nl_oc_msg_leave_one_liner.
 nl_oc_msg_args                  = false    # true/false
 
+# (OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.
+nl_oc_msg_args_min_params       = 0        # unsigned number
+
+# (OC) Max code width of Objective-C message before applying nl_oc_msg_args.
+nl_oc_msg_args_max_code_width   = 0        # unsigned number
+
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
@@ -2034,6 +2045,9 @@ nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove newline between 'return' and the return expression.
 nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove newline between 'throw' and the throw expression.
+nl_throw_expr                   = ignore   # ignore/add/remove/force/not_defined
+
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
@@ -2227,7 +2241,7 @@ nl_max_blank_in_func            = 0        # unsigned number
 # The number of newlines inside an empty function body.
 # This option overrides eat_blanks_after_open_brace and
 # eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
+# nl_collapse_empty_body_functions=true
 nl_inside_empty_func            = 0        # unsigned number
 
 # The number of newlines before a function prototype.
@@ -2279,12 +2293,6 @@ nl_after_func_body_class        = 0        # unsigned number
 # Overrides nl_after_func_body and nl_after_func_body_class.
 nl_after_func_body_one_liner    = 0        # unsigned number
 
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
 # The number of newlines before a block of typedefs. If nl_after_access_spec
 # is non-zero, that option takes precedence.
 #
@@ -2301,15 +2309,27 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of empty newlines before a block of variable definitions
+# The minimum number of blank lines after a block of variable definitions
+# at the top of a function body. If any preprocessor directives appear
+# between the opening brace of the function and the variable block, then
+# it is considered as not at the top of the function.Newlines are added
+# before trailing preprocessor directives, if any exist.
+#
+# 0: No change (default).
+nl_var_def_blk_end_func_top     = 0        # unsigned number
+
+# The minimum number of empty newlines before a block of variable definitions
 # not at the top of a function body. If nl_after_access_spec is non-zero,
-# that option takes precedence.
+# that option takes precedence. Newlines are not added at the top of the
+# file or just after an opening brace. Newlines are added above any
+# preprocessor directives before the block.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of empty newlines after a block of variable definitions
-# not at the top of a function body.
+# The minimum number of empty newlines after a block of variable definitions
+# not at the top of a function body. Newlines are not added if the block
+# is at the bottom of the file or just before a preprocessor directive.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2625,11 +2645,6 @@ align_var_def_inline            = false    # true/false
 # 0: Don't align (default).
 align_assign_span               = 0        # unsigned number
 
-# The span for aligning on '{' in braced init list.
-#
-# 0: Don't align (default).
-align_braced_init_list_span     = 0        # unsigned number
-
 # The span for aligning on '=' in function prototype modifier.
 #
 # 0: Don't align (default).
@@ -2646,6 +2661,11 @@ align_assign_thresh             = 0        # number
 # Depends on 'align_assign_span' and 'align_assign_thresh' settings.
 align_assign_on_multi_var_defs  = false    # true/false
 
+# The span for aligning on '{' in braced init list.
+#
+# 0: Don't align (default).
+align_braced_init_list_span     = 0        # unsigned number
+
 # The threshold for aligning on '{' in braced init list.
 # Use a negative number for absolute thresholds.
 #
@@ -3099,9 +3119,12 @@ mod_full_brace_nl               = 0        # unsigned number
 #   mod_full_brace_function
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
-# Add or remove unnecessary parenthesis on 'return' statement.
+# Add or remove unnecessary parentheses on 'return' statement.
 mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove unnecessary parentheses on 'throw' statement.
+mod_paren_on_throw              = ignore   # ignore/add/remove/force/not_defined
+
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
 
@@ -3199,6 +3222,49 @@ mod_remove_empty_return         = false    # true/false
 # Add or remove the comma after the last value of an enumeration.
 mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
+# Syntax to use for infinite loops.
+#
+# 0: Leave syntax alone (default)
+# 1: Rewrite as `for(;;)`
+# 2: Rewrite as `while(true)`
+# 3: Rewrite as `do`...`while(true);`
+# 4: Rewrite as `while(1)`
+# 5: Rewrite as `do`...`while(1);`
+#
+# Infinite loops that do not already match one of these syntaxes are ignored.
+# Other options that affect loop formatting will be applied after transforming
+# the syntax.
+mod_infinite_loop               = 0        # unsigned number
+
+# Add or remove the 'int' keyword in 'int short'.
+mod_int_short                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'short int'.
+mod_short_int                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int long'.
+mod_int_long                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'long int'.
+mod_long_int                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int signed'.
+mod_int_signed                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'signed int'.
+mod_signed_int                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int unsigned'.
+mod_int_unsigned                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'unsigned int'.
+mod_unsigned_int                = ignore   # ignore/add/remove/force/not_defined
+
+# If there is a situation where mod_int_* and mod_*_int would result in
+# multiple int keywords, whether to keep the rightmost int (the default) or the
+# leftmost int.
+mod_int_prefer_int_on_left      = false    # true/false
+
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
 mod_sort_oc_properties          = false    # true/false
@@ -3230,6 +3296,16 @@ mod_sort_oc_property_nullability_weight = 0        # number
 # Preprocessor options
 #
 
+# How to use tabs when indenting preprocessor code.
+#
+# -1: Use 'indent_with_tabs' setting (default)
+#  0: Spaces only
+#  1: Indent with tabs to brace level, align with spaces
+#  2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: -1
+pp_indent_with_tabs             = -1       # number
+
 # Add or remove indentation of preprocessor directives inside #if blocks
 # at brace level 0 (file-level).
 pp_indent                       = ignore   # ignore/add/remove/force/not_defined
@@ -3250,10 +3326,10 @@ pp_indent_at_level0             = false    # true/false
 # Default: 1
 pp_indent_count                 = 1        # unsigned number
 
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
+# Add or remove space after # based on pp level of #if blocks.
+pp_space_after                  = ignore   # ignore/add/remove/force/not_defined
 
-# Sets the number of spaces per level added with pp_space.
+# Sets the number of spaces per level added with pp_space_after.
 pp_space_count                  = 0        # unsigned number
 
 # The indent for '#region' and '#endregion' in C# and '#pragma region' in
@@ -3286,22 +3362,34 @@ pp_include_at_level             = false    # true/false
 # Whether to ignore the '#define' body while formatting.
 pp_ignore_define_body           = false    # true/false
 
+# An offset value that controls the indentation of the body of a multiline #define.
+# 'body' refers to all the lines of a multiline #define except the first line.
+# Requires 'pp_ignore_define_body = false'.
+#
+#  <0: Absolute column: the body indentation starts off at the specified column
+#      (ex. -3 ==> the body is indented starting from column 3)
+# >=0: Relative to the column of the '#' of '#define'
+#      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
+#
+# Default: 8
+pp_multiline_define_body_indent = 8        # number
+
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
+# Only applies to the indent of the preprocessor that the case statements
 # directly inside of.
 #
 # Default: true
 pp_indent_case                  = true     # true/false
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
+# Only applies to the indent of the preprocessor that the function definition
 # is directly inside of.
 #
 # Default: true
 pp_indent_func_def              = true     # true/false
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
+# Only applies to the indent of the preprocessor that the extern block is
 # directly inside of.
 #
 # Default: true
@@ -3309,7 +3397,7 @@ pp_indent_extern                = true     # true/false
 
 # How to indent braces directly inside #if, #else, and #endif.
 # Requires pp_if_indent_code=true and only applies to the indent of the
-# preprocesser that the braces are directly inside of.
+# preprocessor that the braces are directly inside of.
 #  0: No extra indent
 #  1: Indent by one level
 # -1: Preserve original indentation
@@ -3382,10 +3470,10 @@ use_indent_continue_only_once   = false    # true/false
 
 # The indentation can be:
 # - after the assignment, at the '[' character
-# - at the begin of the lambda body
+# - at the beginning of the lambda body
 #
-# true:  indentation will be after the assignment
-# false: indentation will be at the begin of the lambda body (default)
+# true:  indentation will be at the beginning of the lambda body
+# false: indentation will be after the assignment (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
@@ -3437,6 +3525,18 @@ debug_timeout                   = 0        # number
 # 0: do not truncate.
 debug_truncate                  = 0        # unsigned number
 
+# sort (or not) the tracking info.
+#
+# Default: true
+debug_sort_the_tracks           = true     # true/false
+
+# decode (or not) the flags as a new line.
+# only if the -p option is set.
+debug_decode_the_flags          = false    # true/false
+
+# insert the number of the line at the beginning of each line
+set_numbering_for_html_output   = false    # true/false
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/configuration.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/configuration.txt
index f61b1176..f61b1176 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/configuration.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/configuration.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/default.cfg
index 571f4038..7c523470 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/default.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/default.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.75.0
+# Uncrustify-0.76.0
 
 #
 # General options
@@ -447,15 +447,15 @@ sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 # Default: remove
 sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
 sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
+# (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
 sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
 sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
@@ -995,7 +995,7 @@ sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between ')' and type in 'new(foo) BAR'.
 sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space inside parenthesis of the new operator
+# Add or remove space inside parentheses of the new operator
 # as in 'new(foo) BAR'.
 sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
 
@@ -1537,7 +1537,7 @@ indent_using_block              = true     # true/false
 # How to indent the continuation of ternary operator.
 #
 # 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
+# 1: When the `if_false` is a continuation, indent it under the `if_true` branch
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
@@ -1565,10 +1565,15 @@ donot_indent_func_def_close_paren = false    # true/false
 # Newline adding and removing options
 #
 
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
+# Whether to collapse empty blocks between '{' and '}' except for functions.
+# Use nl_collapse_empty_body_functions to specify how empty function braces
+# should be formatted.
 nl_collapse_empty_body          = false    # true/false
 
+# Whether to collapse empty blocks between '{' and '}' for functions only.
+# If true, overrides nl_inside_empty_func.
+nl_collapse_empty_body_functions = false    # true/false
+
 # Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
 nl_assign_leave_one_liners      = false    # true/false
 
@@ -2021,6 +2026,12 @@ nl_template_end                 = false    # true/false
 # See nl_oc_msg_leave_one_liner.
 nl_oc_msg_args                  = false    # true/false
 
+# (OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.
+nl_oc_msg_args_min_params       = 0        # unsigned number
+
+# (OC) Max code width of Objective-C message before applying nl_oc_msg_args.
+nl_oc_msg_args_max_code_width   = 0        # unsigned number
+
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
@@ -2034,6 +2045,9 @@ nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove newline between 'return' and the return expression.
 nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove newline between 'throw' and the throw expression.
+nl_throw_expr                   = ignore   # ignore/add/remove/force/not_defined
+
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
@@ -2227,7 +2241,7 @@ nl_max_blank_in_func            = 0        # unsigned number
 # The number of newlines inside an empty function body.
 # This option overrides eat_blanks_after_open_brace and
 # eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
+# nl_collapse_empty_body_functions=true
 nl_inside_empty_func            = 0        # unsigned number
 
 # The number of newlines before a function prototype.
@@ -2279,12 +2293,6 @@ nl_after_func_body_class        = 0        # unsigned number
 # Overrides nl_after_func_body and nl_after_func_body_class.
 nl_after_func_body_one_liner    = 0        # unsigned number
 
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
 # The number of newlines before a block of typedefs. If nl_after_access_spec
 # is non-zero, that option takes precedence.
 #
@@ -2301,15 +2309,27 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of empty newlines before a block of variable definitions
+# The minimum number of blank lines after a block of variable definitions
+# at the top of a function body. If any preprocessor directives appear
+# between the opening brace of the function and the variable block, then
+# it is considered as not at the top of the function.Newlines are added
+# before trailing preprocessor directives, if any exist.
+#
+# 0: No change (default).
+nl_var_def_blk_end_func_top     = 0        # unsigned number
+
+# The minimum number of empty newlines before a block of variable definitions
 # not at the top of a function body. If nl_after_access_spec is non-zero,
-# that option takes precedence.
+# that option takes precedence. Newlines are not added at the top of the
+# file or just after an opening brace. Newlines are added above any
+# preprocessor directives before the block.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of empty newlines after a block of variable definitions
-# not at the top of a function body.
+# The minimum number of empty newlines after a block of variable definitions
+# not at the top of a function body. Newlines are not added if the block
+# is at the bottom of the file or just before a preprocessor directive.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2625,11 +2645,6 @@ align_var_def_inline            = false    # true/false
 # 0: Don't align (default).
 align_assign_span               = 0        # unsigned number
 
-# The span for aligning on '{' in braced init list.
-#
-# 0: Don't align (default).
-align_braced_init_list_span     = 0        # unsigned number
-
 # The span for aligning on '=' in function prototype modifier.
 #
 # 0: Don't align (default).
@@ -2646,6 +2661,11 @@ align_assign_thresh             = 0        # number
 # Depends on 'align_assign_span' and 'align_assign_thresh' settings.
 align_assign_on_multi_var_defs  = false    # true/false
 
+# The span for aligning on '{' in braced init list.
+#
+# 0: Don't align (default).
+align_braced_init_list_span     = 0        # unsigned number
+
 # The threshold for aligning on '{' in braced init list.
 # Use a negative number for absolute thresholds.
 #
@@ -3099,9 +3119,12 @@ mod_full_brace_nl               = 0        # unsigned number
 #   mod_full_brace_function
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
-# Add or remove unnecessary parenthesis on 'return' statement.
+# Add or remove unnecessary parentheses on 'return' statement.
 mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove unnecessary parentheses on 'throw' statement.
+mod_paren_on_throw              = ignore   # ignore/add/remove/force/not_defined
+
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
 
@@ -3199,6 +3222,49 @@ mod_remove_empty_return         = false    # true/false
 # Add or remove the comma after the last value of an enumeration.
 mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
+# Syntax to use for infinite loops.
+#
+# 0: Leave syntax alone (default)
+# 1: Rewrite as `for(;;)`
+# 2: Rewrite as `while(true)`
+# 3: Rewrite as `do`...`while(true);`
+# 4: Rewrite as `while(1)`
+# 5: Rewrite as `do`...`while(1);`
+#
+# Infinite loops that do not already match one of these syntaxes are ignored.
+# Other options that affect loop formatting will be applied after transforming
+# the syntax.
+mod_infinite_loop               = 0        # unsigned number
+
+# Add or remove the 'int' keyword in 'int short'.
+mod_int_short                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'short int'.
+mod_short_int                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int long'.
+mod_int_long                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'long int'.
+mod_long_int                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int signed'.
+mod_int_signed                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'signed int'.
+mod_signed_int                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int unsigned'.
+mod_int_unsigned                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'unsigned int'.
+mod_unsigned_int                = ignore   # ignore/add/remove/force/not_defined
+
+# If there is a situation where mod_int_* and mod_*_int would result in
+# multiple int keywords, whether to keep the rightmost int (the default) or the
+# leftmost int.
+mod_int_prefer_int_on_left      = false    # true/false
+
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
 mod_sort_oc_properties          = false    # true/false
@@ -3230,6 +3296,16 @@ mod_sort_oc_property_nullability_weight = 0        # number
 # Preprocessor options
 #
 
+# How to use tabs when indenting preprocessor code.
+#
+# -1: Use 'indent_with_tabs' setting (default)
+#  0: Spaces only
+#  1: Indent with tabs to brace level, align with spaces
+#  2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: -1
+pp_indent_with_tabs             = -1       # number
+
 # Add or remove indentation of preprocessor directives inside #if blocks
 # at brace level 0 (file-level).
 pp_indent                       = ignore   # ignore/add/remove/force/not_defined
@@ -3250,10 +3326,10 @@ pp_indent_at_level0             = false    # true/false
 # Default: 1
 pp_indent_count                 = 1        # unsigned number
 
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
+# Add or remove space after # based on pp level of #if blocks.
+pp_space_after                  = ignore   # ignore/add/remove/force/not_defined
 
-# Sets the number of spaces per level added with pp_space.
+# Sets the number of spaces per level added with pp_space_after.
 pp_space_count                  = 0        # unsigned number
 
 # The indent for '#region' and '#endregion' in C# and '#pragma region' in
@@ -3286,22 +3362,34 @@ pp_include_at_level             = false    # true/false
 # Whether to ignore the '#define' body while formatting.
 pp_ignore_define_body           = false    # true/false
 
+# An offset value that controls the indentation of the body of a multiline #define.
+# 'body' refers to all the lines of a multiline #define except the first line.
+# Requires 'pp_ignore_define_body = false'.
+#
+#  <0: Absolute column: the body indentation starts off at the specified column
+#      (ex. -3 ==> the body is indented starting from column 3)
+# >=0: Relative to the column of the '#' of '#define'
+#      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
+#
+# Default: 8
+pp_multiline_define_body_indent = 8        # number
+
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
+# Only applies to the indent of the preprocessor that the case statements
 # directly inside of.
 #
 # Default: true
 pp_indent_case                  = true     # true/false
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
+# Only applies to the indent of the preprocessor that the function definition
 # is directly inside of.
 #
 # Default: true
 pp_indent_func_def              = true     # true/false
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
+# Only applies to the indent of the preprocessor that the extern block is
 # directly inside of.
 #
 # Default: true
@@ -3309,7 +3397,7 @@ pp_indent_extern                = true     # true/false
 
 # How to indent braces directly inside #if, #else, and #endif.
 # Requires pp_if_indent_code=true and only applies to the indent of the
-# preprocesser that the braces are directly inside of.
+# preprocessor that the braces are directly inside of.
 #  0: No extra indent
 #  1: Indent by one level
 # -1: Preserve original indentation
@@ -3382,10 +3470,10 @@ use_indent_continue_only_once   = false    # true/false
 
 # The indentation can be:
 # - after the assignment, at the '[' character
-# - at the begin of the lambda body
+# - at the beginning of the lambda body
 #
-# true:  indentation will be after the assignment
-# false: indentation will be at the begin of the lambda body (default)
+# true:  indentation will be at the beginning of the lambda body
+# false: indentation will be after the assignment (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
@@ -3437,6 +3525,18 @@ debug_timeout                   = 0        # number
 # 0: do not truncate.
 debug_truncate                  = 0        # unsigned number
 
+# sort (or not) the tracking info.
+#
+# Default: true
+debug_sort_the_tracks           = true     # true/false
+
+# decode (or not) the flags as a new line.
+# only if the -p option is set.
+debug_decode_the_flags          = false    # true/false
+
+# insert the number of the line at the beginning of each line
+set_numbering_for_html_output   = false    # true/false
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.in.c
index c1a53476..c1a53476 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.out.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.out.c
index ceb484c6..ceb484c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.out.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.out.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/images/linuxlinks.gif b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/images/linuxlinks.gif
index d3adec5c..d3adec5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/images/linuxlinks.gif
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/images/linuxlinks.gif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/index.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/index.html
index 452b53bf..01d057f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/index.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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 - 808 configurable options as of version 0.75.0</li>
+   <li>Highly configurable - 828 configurable options as of version 0.76.0</li>
 </ul>
 
 <p>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/linux.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/linux.cfg.txt
index baae9848..7c3bc772 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/linux.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/linux.cfg.txt
@@ -14,22 +14,22 @@ indent_label		= 1		# pos: absolute col, neg: relative column
 # inter-symbol newlines
 #
 
-nl_enum_brace		= remove	# "enum {" vs "enum \n {"
-nl_union_brace		= remove	# "union {" vs "union \n {"
-nl_struct_brace		= remove	# "struct {" vs "struct \n {"
-nl_do_brace 		= remove	# "do {" vs "do \n {"
-nl_if_brace 		= remove	# "if () {" vs "if () \n {"
-nl_for_brace 		= remove	# "for () {" vs "for () \n {"
-nl_else_brace 		= remove	# "else {" vs "else \n {"
-nl_while_brace 		= remove	# "while () {" vs "while () \n {"
-nl_switch_brace 	= remove	# "switch () {" vs "switch () \n {"
-nl_brace_while		= remove	# "} while" vs "} \n while" - cuddle while
-nl_brace_else		= remove	# "} else" vs "} \n else" - cuddle else
-nl_func_var_def_blk	= 1
-nl_fcall_brace		= remove	# "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace		= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return		= TRUE;
-# nl_before_case	= 1
+nl_enum_brace				= remove	# "enum {" vs "enum \n {"
+nl_union_brace				= remove	# "union {" vs "union \n {"
+nl_struct_brace				= remove	# "struct {" vs "struct \n {"
+nl_do_brace				= remove	# "do {" vs "do \n {"
+nl_if_brace				= remove	# "if () {" vs "if () \n {"
+nl_for_brace				= remove	# "for () {" vs "for () \n {"
+nl_else_brace				= remove	# "else {" vs "else \n {"
+nl_while_brace				= remove	# "while () {" vs "while () \n {"
+nl_switch_brace				= remove	# "switch () {" vs "switch () \n {"
+nl_brace_while				= remove	# "} while" vs "} \n while" - cuddle while
+nl_brace_else				= remove	# "} else" vs "} \n else" - cuddle else
+nl_var_def_blk_end_func_top		= 1
+nl_fcall_brace				= remove	# "list_for_each() {" vs "list_for_each()\n{"
+nl_fdef_brace				= add		# "int foo() {" vs "int foo()\n{"
+# nl_after_return			= TRUE;
+# nl_before_case			= 1
 
 
 #
@@ -73,8 +73,8 @@ sp_func_proto_paren	= remove	# "int foo ();" vs "int foo();"
 
 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_keep_tabs	= true
+align_enum_equ_span	= 4		# '=' in enum definition
 # align_nl_cont		= TRUE
 # align_var_def_span	= 2
 # align_var_def_inline	= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options.html
index 554836c3..554836c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ASM.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ASM.html
index 4de0e7bb..4de0e7bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ASM.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ASM.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Align.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Align.html
index 99edad58..474e9564 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Align.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Align.html
@@ -3,9 +3,9 @@
 align_pp_define_gap
 The minimum space between label and value of a preprocessor define
 
-#define set_chunk_type(pc, tt)      do { \
+#define SetType(tt)      do { \
       LOG_FUNC_CALL(); \
-      set_chunk_type_real((pc), (tt)); \
+      SetTypeReal((tt)); \
 } while (false)
 align_nl_cont                 = true
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_CLI_NET.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_CLI_NET.html
index 8838cdf0..8838cdf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_CLI_NET.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_CLI_NET.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_C_sharp.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_C_sharp.html
index 74767b9d..74767b9d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_C_sharp.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_C_sharp.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_D.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_D.html
index 308b5c58..308b5c58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_D.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_D.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Indenting.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Indenting.html
index 7887f759..7887f759 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Indenting.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Indenting.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Java.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Java.html
index 80083042..80083042 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Java.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Java.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ModifyCode.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ModifyCode.html
index e20e1098..e20e1098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ModifyCode.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ModifyCode.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Namespace.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Namespace.html
index 74589df0..74589df0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Namespace.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Namespace.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_NewLines.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_NewLines.html
index 85a37821..e5150ed4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_NewLines.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_NewLines.html
@@ -31,7 +31,7 @@ void bar_3(int x,
 {
     int a = 5;<a title="nl_after_semicolon"><strong><font color="red"> █</font></strong></a>
     int b = 7;
-    <a title="nl_func_var_def_blk"><strong><font color="red">    █</font></strong></a>
+    <a title="nl_var_def_blk_end_func_top"><strong><font color="red">    █</font></strong></a>
     a = 135;
     list_for_each(item, list) {
 <a title="nl_fcall_brace"><strong><font color="red">                             █</font></strong></a>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Objectiv-C.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Objectiv-C.html
index 993a1b95..993a1b95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Objectiv-C.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Objectiv-C.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Positioning.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Positioning.html
index 4e8a36cc..4e8a36cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Positioning.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Positioning.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Preprocessor.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Preprocessor.html
index 1d99b69d..1d99b69d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Preprocessor.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Preprocessor.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Assign.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Assign.html
index 10c8b6b0..10c8b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Assign.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Assign.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Byref.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Byref.html
index 7ad47f72..7ad47f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Byref.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Byref.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Case.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Case.html
index e40bfc5b..e40bfc5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Case.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Case.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Cast.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Cast.html
index 9e0b6e2d..9e0b6e2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Cast.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Cast.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Class.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Class.html
index 1bd1c4a5..1bd1c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Class.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Class.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Comma.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Comma.html
index 3b3f0de1..3b3f0de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Comma.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Comma.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Enum.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Enum.html
index f208c95f..f208c95f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Enum.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Enum.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_For.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_For.html
index 5107f89f..5107f89f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_For.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_For.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_New.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_New.html
index 587844ae..587844ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_New.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_New.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Operator.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Operator.html
index d73c964d..d73c964d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Operator.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Operator.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Paren.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Paren.html
index caa4a5a5..caa4a5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Paren.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Paren.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Template.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Template.html
index d8792888..d8792888 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Template.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Template.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Spaces.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Spaces.html
index 35265fc6..35265fc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Spaces.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Spaces.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/project-support.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/project-support.jpg
index 5d15550f..5d15550f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/project-support.jpg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/project-support.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.css b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.css
index 240171e9..240171e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.css
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.css
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.html
index 0528eb63..0528eb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/not_a_compiler.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/not_a_compiler.txt
index 439d4309..439d4309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/not_a_compiler.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/not_a_compiler.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/overview.odt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/overview.odt
index e14e3285..e14e3285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/overview.odt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/overview.odt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/paren_stack.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/paren_stack.txt
index 109709dc..109709dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/paren_stack.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/paren_stack.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/preprocessor_indentation.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/preprocessor_indentation.txt
index a82947cb..7940de28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/preprocessor_indentation.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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
+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
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/theory.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/theory.txt
index 99324855..37ba9da1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/theory.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/theory.txt
@@ -57,7 +57,7 @@ Brace parent types are set.
 Statement start and expression starts are labeled.
 And #ifdef constructs are handled.
 
-This step determines the levels (brace_level, level, & pp_level).
+This step determines the levels (m_braceLevel, level and m_ppLevel).
 
 REVISIT:
   The code in brace_cleanup.cpp needs to be reworked to take advantage of being
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/threads.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/threads.txt
index f6ed4edd..f6ed4edd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/threads.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/threads.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/track.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/track.html
index e49e4370..e49e4370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/track.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/track.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMakeLists.txt
index 72b6efa3..72b6efa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMakeLists.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_catFiles.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_catFiles.cmake
index c637ea24..c637ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_catFiles.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_catFiles.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_emscripten_test.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_emscripten_test.cmake
index a37ee945..a37ee945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_emscripten_test.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_emscripten_test.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/README.md
index 22012383..22012383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/README.md
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/build.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/build.sh
index df4b6fe3..df4b6fe3 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/build.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/build.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/libUncrustify.d.ts b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/libUncrustify.d.ts
index 1e7b7fb6..1e7b7fb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/libUncrustify.d.ts
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/libUncrustify.d.ts
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_file
index 17315134..17315134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_module.js
index cbf8f57b..cbf8f57b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_file
index 6a6b5e98..6a6b5e98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_module.js
index 05d09cd7..05d09cd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/run_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/run_tests.py
index c7a4fcae..c7a4fcae 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/run_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/run_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/test_run.js b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/test_run.js
index 27627094..27627094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/test_run.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/test_run.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/MS-calling_conventions.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/MS-calling_conventions.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/MS-calling_conventions.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/MS-calling_conventions.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/align_assign.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/align_assign.txt
index ecc85081..ecc85081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/align_assign.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/align_assign.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/amxmodx.cfg
index 5f625076..c81a3e07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/amxmodx.cfg
@@ -13,7 +13,7 @@ indent_with_tabs    = 2    # 1=only to the 'level' indent, 2=use tab indenting
 #indent_paren_nl     = 1    # indent-align under paren for open followed by nl
 
 pp_indent           = remove # indent preproc 1 space per level (a/i/r)
-pp_space            = remove # spaces between # and word (add/ignore/remove)
+pp_space_after      = remove # spaces between # and word (add/ignore/remove)
 
 #indent_switch_case  = 1    # spaces to indent case from switch
 #indent_case_brace   = 0    # spaces to indent '{' from case
@@ -134,23 +134,23 @@ align_typedef_star_style = 1      # Start aligning style
 # Newline Adding and Removing Options
 #        Add/Remove/Ignore
 
-nl_fdef_brace        = add    # "int foo() {" vs "int foo()\n{"
-nl_func_decl_start   = ignore # newline after the '(' in a function decl
-nl_func_decl_args    = ignore # newline after each ',' in a function decl
-nl_func_decl_end     = ignore # newline before the ')' in a function decl
-nl_func_type_name    = ignore # newline between return type and func name in def
-nl_func_var_def_blk  = 0      # newline after a block of variable defs
-nl_before_case       = false  # newline before 'case' statement
-nl_after_return      = false  # newline after return statement
-nl_after_case        = false  # disallow nested "case 1: a=3;"
-nl_fcall_brace       = add    # newline between function call and open brace
-nl_squeeze_ifdef     = false  # no blanks after #ifxx, #elxx, or before #endif TRUE/F
-nl_enum_brace        = ignore # nl between enum and brace
-nl_struct_brace      = ignore # nl between struct and brace
-nl_union_brace       = ignore # nl between union and brace
-nl_assign_brace      = ignore # nl between '=' and brace
-nl_class_brace       = ignore # nl between class name and brace
-nl_namespace_brace   = ignore # nl between namespace name and brace
+nl_fdef_brace               = add    # "int foo() {" vs "int foo()\n{"
+nl_func_decl_start          = ignore # newline after the '(' in a function decl
+nl_func_decl_args           = ignore # newline after each ',' in a function decl
+nl_func_decl_end            = ignore # newline before the ')' in a function decl
+nl_func_type_name           = ignore # newline between return type and func name in def
+nl_var_def_blk_end_func_top = 0      # newline after a block of variable defs
+nl_before_case              = false  # newline before 'case' statement
+nl_after_return             = false  # newline after return statement
+nl_after_case               = false  # disallow nested "case 1: a=3;"
+nl_fcall_brace              = add    # newline between function call and open brace
+nl_squeeze_ifdef            = false  # no blanks after #ifxx, #elxx, or before #endif TRUE/F
+nl_enum_brace               = ignore # nl between enum and brace
+nl_struct_brace             = ignore # nl between struct and brace
+nl_union_brace              = ignore # nl between union and brace
+nl_assign_brace             = ignore # nl between '=' and brace
+nl_class_brace              = ignore # nl between class name and brace
+nl_namespace_brace          = ignore # nl between namespace name and brace
 
 nl_do_brace          = add    # nl between do and {
 nl_if_brace          = add    # nl between if and {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben.cfg
index 4ab301ce..58e7d2bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben.cfg
@@ -711,7 +711,7 @@ nl_assign_brace                           = add      # ignore/add/remove/force
 
 # The number of blank lines after a block of variable definitions at the top of a function body
 # 0 = No change (default)
-nl_func_var_def_blk                       = 1        # number
+nl_var_def_blk_end_func_top               = 1        # number
 
 # The number of newlines before a block of typedefs
 # 0 = No change (default)
@@ -1137,7 +1137,7 @@ pp_indent_at_level0                       = false    # false/true
 # Default=1.
 pp_indent_count                           = 1        # number
 
-# Sets the number of spaces added with pp_space
+# Sets the number of spaces added with pp_space_after
 pp_space_count                            = 0        # number
 
 # The indent for #region and #endregion in C# and '#pragma region' in C/C++
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben2.cfg
index 38464c10..fa27f08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben2.cfg
@@ -19,7 +19,7 @@ nl_for_brace			= add		# "for () {" vs "for () \n {"
 nl_else_brace			= add		# "else {" vs "else \n {"
 nl_while_brace			= add		# "while () {" vs "while () \n {"
 nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
+nl_var_def_blk_end_func_top	= 1
 nl_before_case			= 1
 nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
 nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/d.cfg
index e69c37c7..7f5032d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/d.cfg
@@ -19,11 +19,11 @@ nl_for_brace			= add		# "for () {" vs "for () \n {"
 nl_else_brace			= add		# "else {" vs "else \n {"
 nl_while_brace			= add		# "while () {" vs "while () \n {"
 nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-# nl_func_var_def_blk		= 1
-# nl_before_case			= 1
+# nl_var_def_blk_end_func_top	= 1
+# nl_before_case		= 1
 nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
 nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return			= TRUE
+# nl_after_return		= TRUE
 nl_brace_while			= remove
 nl_brace_else			= add
 nl_squeeze_ifdef		= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/defaults.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/defaults.cfg
index 571f4038..7c523470 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/defaults.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/defaults.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.75.0
+# Uncrustify-0.76.0
 
 #
 # General options
@@ -447,15 +447,15 @@ sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 # Default: remove
 sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
 sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
+# (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
 sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
 sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
@@ -995,7 +995,7 @@ sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between ')' and type in 'new(foo) BAR'.
 sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space inside parenthesis of the new operator
+# Add or remove space inside parentheses of the new operator
 # as in 'new(foo) BAR'.
 sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
 
@@ -1537,7 +1537,7 @@ indent_using_block              = true     # true/false
 # How to indent the continuation of ternary operator.
 #
 # 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
+# 1: When the `if_false` is a continuation, indent it under the `if_true` branch
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
@@ -1565,10 +1565,15 @@ donot_indent_func_def_close_paren = false    # true/false
 # Newline adding and removing options
 #
 
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
+# Whether to collapse empty blocks between '{' and '}' except for functions.
+# Use nl_collapse_empty_body_functions to specify how empty function braces
+# should be formatted.
 nl_collapse_empty_body          = false    # true/false
 
+# Whether to collapse empty blocks between '{' and '}' for functions only.
+# If true, overrides nl_inside_empty_func.
+nl_collapse_empty_body_functions = false    # true/false
+
 # Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
 nl_assign_leave_one_liners      = false    # true/false
 
@@ -2021,6 +2026,12 @@ nl_template_end                 = false    # true/false
 # See nl_oc_msg_leave_one_liner.
 nl_oc_msg_args                  = false    # true/false
 
+# (OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.
+nl_oc_msg_args_min_params       = 0        # unsigned number
+
+# (OC) Max code width of Objective-C message before applying nl_oc_msg_args.
+nl_oc_msg_args_max_code_width   = 0        # unsigned number
+
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
@@ -2034,6 +2045,9 @@ nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove newline between 'return' and the return expression.
 nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove newline between 'throw' and the throw expression.
+nl_throw_expr                   = ignore   # ignore/add/remove/force/not_defined
+
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
@@ -2227,7 +2241,7 @@ nl_max_blank_in_func            = 0        # unsigned number
 # The number of newlines inside an empty function body.
 # This option overrides eat_blanks_after_open_brace and
 # eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
+# nl_collapse_empty_body_functions=true
 nl_inside_empty_func            = 0        # unsigned number
 
 # The number of newlines before a function prototype.
@@ -2279,12 +2293,6 @@ nl_after_func_body_class        = 0        # unsigned number
 # Overrides nl_after_func_body and nl_after_func_body_class.
 nl_after_func_body_one_liner    = 0        # unsigned number
 
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
 # The number of newlines before a block of typedefs. If nl_after_access_spec
 # is non-zero, that option takes precedence.
 #
@@ -2301,15 +2309,27 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of empty newlines before a block of variable definitions
+# The minimum number of blank lines after a block of variable definitions
+# at the top of a function body. If any preprocessor directives appear
+# between the opening brace of the function and the variable block, then
+# it is considered as not at the top of the function.Newlines are added
+# before trailing preprocessor directives, if any exist.
+#
+# 0: No change (default).
+nl_var_def_blk_end_func_top     = 0        # unsigned number
+
+# The minimum number of empty newlines before a block of variable definitions
 # not at the top of a function body. If nl_after_access_spec is non-zero,
-# that option takes precedence.
+# that option takes precedence. Newlines are not added at the top of the
+# file or just after an opening brace. Newlines are added above any
+# preprocessor directives before the block.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of empty newlines after a block of variable definitions
-# not at the top of a function body.
+# The minimum number of empty newlines after a block of variable definitions
+# not at the top of a function body. Newlines are not added if the block
+# is at the bottom of the file or just before a preprocessor directive.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2625,11 +2645,6 @@ align_var_def_inline            = false    # true/false
 # 0: Don't align (default).
 align_assign_span               = 0        # unsigned number
 
-# The span for aligning on '{' in braced init list.
-#
-# 0: Don't align (default).
-align_braced_init_list_span     = 0        # unsigned number
-
 # The span for aligning on '=' in function prototype modifier.
 #
 # 0: Don't align (default).
@@ -2646,6 +2661,11 @@ align_assign_thresh             = 0        # number
 # Depends on 'align_assign_span' and 'align_assign_thresh' settings.
 align_assign_on_multi_var_defs  = false    # true/false
 
+# The span for aligning on '{' in braced init list.
+#
+# 0: Don't align (default).
+align_braced_init_list_span     = 0        # unsigned number
+
 # The threshold for aligning on '{' in braced init list.
 # Use a negative number for absolute thresholds.
 #
@@ -3099,9 +3119,12 @@ mod_full_brace_nl               = 0        # unsigned number
 #   mod_full_brace_function
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
-# Add or remove unnecessary parenthesis on 'return' statement.
+# Add or remove unnecessary parentheses on 'return' statement.
 mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove unnecessary parentheses on 'throw' statement.
+mod_paren_on_throw              = ignore   # ignore/add/remove/force/not_defined
+
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
 
@@ -3199,6 +3222,49 @@ mod_remove_empty_return         = false    # true/false
 # Add or remove the comma after the last value of an enumeration.
 mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
+# Syntax to use for infinite loops.
+#
+# 0: Leave syntax alone (default)
+# 1: Rewrite as `for(;;)`
+# 2: Rewrite as `while(true)`
+# 3: Rewrite as `do`...`while(true);`
+# 4: Rewrite as `while(1)`
+# 5: Rewrite as `do`...`while(1);`
+#
+# Infinite loops that do not already match one of these syntaxes are ignored.
+# Other options that affect loop formatting will be applied after transforming
+# the syntax.
+mod_infinite_loop               = 0        # unsigned number
+
+# Add or remove the 'int' keyword in 'int short'.
+mod_int_short                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'short int'.
+mod_short_int                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int long'.
+mod_int_long                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'long int'.
+mod_long_int                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int signed'.
+mod_int_signed                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'signed int'.
+mod_signed_int                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int unsigned'.
+mod_int_unsigned                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'unsigned int'.
+mod_unsigned_int                = ignore   # ignore/add/remove/force/not_defined
+
+# If there is a situation where mod_int_* and mod_*_int would result in
+# multiple int keywords, whether to keep the rightmost int (the default) or the
+# leftmost int.
+mod_int_prefer_int_on_left      = false    # true/false
+
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
 mod_sort_oc_properties          = false    # true/false
@@ -3230,6 +3296,16 @@ mod_sort_oc_property_nullability_weight = 0        # number
 # Preprocessor options
 #
 
+# How to use tabs when indenting preprocessor code.
+#
+# -1: Use 'indent_with_tabs' setting (default)
+#  0: Spaces only
+#  1: Indent with tabs to brace level, align with spaces
+#  2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: -1
+pp_indent_with_tabs             = -1       # number
+
 # Add or remove indentation of preprocessor directives inside #if blocks
 # at brace level 0 (file-level).
 pp_indent                       = ignore   # ignore/add/remove/force/not_defined
@@ -3250,10 +3326,10 @@ pp_indent_at_level0             = false    # true/false
 # Default: 1
 pp_indent_count                 = 1        # unsigned number
 
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force/not_defined
+# Add or remove space after # based on pp level of #if blocks.
+pp_space_after                  = ignore   # ignore/add/remove/force/not_defined
 
-# Sets the number of spaces per level added with pp_space.
+# Sets the number of spaces per level added with pp_space_after.
 pp_space_count                  = 0        # unsigned number
 
 # The indent for '#region' and '#endregion' in C# and '#pragma region' in
@@ -3286,22 +3362,34 @@ pp_include_at_level             = false    # true/false
 # Whether to ignore the '#define' body while formatting.
 pp_ignore_define_body           = false    # true/false
 
+# An offset value that controls the indentation of the body of a multiline #define.
+# 'body' refers to all the lines of a multiline #define except the first line.
+# Requires 'pp_ignore_define_body = false'.
+#
+#  <0: Absolute column: the body indentation starts off at the specified column
+#      (ex. -3 ==> the body is indented starting from column 3)
+# >=0: Relative to the column of the '#' of '#define'
+#      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
+#
+# Default: 8
+pp_multiline_define_body_indent = 8        # number
+
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
+# Only applies to the indent of the preprocessor that the case statements
 # directly inside of.
 #
 # Default: true
 pp_indent_case                  = true     # true/false
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
+# Only applies to the indent of the preprocessor that the function definition
 # is directly inside of.
 #
 # Default: true
 pp_indent_func_def              = true     # true/false
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
+# Only applies to the indent of the preprocessor that the extern block is
 # directly inside of.
 #
 # Default: true
@@ -3309,7 +3397,7 @@ pp_indent_extern                = true     # true/false
 
 # How to indent braces directly inside #if, #else, and #endif.
 # Requires pp_if_indent_code=true and only applies to the indent of the
-# preprocesser that the braces are directly inside of.
+# preprocessor that the braces are directly inside of.
 #  0: No extra indent
 #  1: Indent by one level
 # -1: Preserve original indentation
@@ -3382,10 +3470,10 @@ use_indent_continue_only_once   = false    # true/false
 
 # The indentation can be:
 # - after the assignment, at the '[' character
-# - at the begin of the lambda body
+# - at the beginning of the lambda body
 #
-# true:  indentation will be after the assignment
-# false: indentation will be at the begin of the lambda body (default)
+# true:  indentation will be at the beginning of the lambda body
+# false: indentation will be after the assignment (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
@@ -3437,6 +3525,18 @@ debug_timeout                   = 0        # number
 # 0: do not truncate.
 debug_truncate                  = 0        # unsigned number
 
+# sort (or not) the tracking info.
+#
+# Default: true
+debug_sort_the_tracks           = true     # true/false
+
+# decode (or not) the flags as a new line.
+# only if the -p option is set.
+debug_decode_the_flags          = false    # true/false
+
+# insert the number of the line at the beginning of each line
+set_numbering_for_html_output   = false    # true/false
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/dofiles.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/dofiles.sh
index e08fd6f7..e08fd6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/dofiles.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/dofiles.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/freebsd.cfg
index 27c6d152..6cf0a155 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/freebsd.cfg
@@ -231,7 +231,7 @@ nl_end_of_file_min                       = 1
 nl_assign_brace                          = add
 nl_assign_square                         = ignore
 nl_after_square_assign                   = ignore
-nl_func_var_def_blk                      = 1
+nl_var_def_blk_end_func_top              = 1
 nl_fcall_brace                           = add
 nl_enum_brace                            = remove
 nl_struct_brace                          = remove
@@ -377,7 +377,7 @@ pp_indent                                = remove
 pp_indent_at_level                       = false
 pp_indent_at_level0                      = false
 pp_indent_count                          = 1
-pp_space                                 = ignore
+pp_space_after                           = ignore
 pp_space_count                           = 0
 pp_indent_region                         = 0
 pp_region_indent_code                    = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/gnu-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/gnu-indent.cfg
index 03045618..f30ba47d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/gnu-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/gnu-indent.cfg
@@ -19,7 +19,7 @@ nl_for_brace			= add		# "for () {" vs "for () \n {"
 nl_else_brace			= add		# "else {" vs "else \n {"
 nl_while_brace			= add		# "while () {" vs "while () \n {"
 nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
+nl_var_def_blk_end_func_top	= 1
 nl_before_case			= 1
 nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
 nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/klaus.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/klaus.cfg
index 289ee792..93e38ed5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/klaus.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/klaus.cfg
@@ -325,7 +325,7 @@ nl_end_of_file_min            = 1        # number
 nl_assign_brace               = add      # ignore/add/remove/force
 
 # The number of newlines after a block of variable definitions
-nl_func_var_def_blk           = 1        # number
+nl_var_def_blk_end_func_top   = 1        # number
 
 # Add or remove newline between function call and '('
 nl_fcall_brace                = add      # ignore/add/remove/force
@@ -505,4 +505,4 @@ cmt_star_cont                 = true     # false/true
 pp_indent                     = ignore   # ignore/add/remove/force
 
 # Add or remove space between # and, say, define
-pp_space                      = ignore   # ignore/add/remove/force
+pp_space_after                = ignore   # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/kr-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/kr-indent.cfg
index cd39b27a..d2940437 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/kr-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/kr-indent.cfg
@@ -19,11 +19,11 @@ nl_for_brace			= remove	# "for () {" vs "for () \n {"
 nl_else_brace			= remove	# "else {" vs "else \n {"
 nl_while_brace			= remove	# "while () {" vs "while () \n {"
 nl_switch_brace			= remove	# "switch () {" vs "switch () \n {"
-# nl_func_var_def_blk		= 1
-# nl_before_case			= 1
+# nl_var_def_blk_end_func_top	= 1
+# nl_before_case		= 1
 nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
 nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
-# nl_after_return			= TRUE
+# nl_after_return		= TRUE
 nl_brace_while			= remove
 nl_brace_else			= remove
 nl_squeeze_ifdef		= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux-indent.cfg
index d6baa165..3d924d45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux-indent.cfg
@@ -16,20 +16,20 @@ indent_label		= 2		# pos: absolute col, neg: relative column
 # inter-symbol newlines
 #
 
-nl_enum_brace		= remove	# "enum {" vs "enum \n {"
-nl_union_brace		= remove	# "union {" vs "union \n {"
-nl_struct_brace		= remove	# "struct {" vs "struct \n {"
-nl_do_brace 		= remove	# "do {" vs "do \n {"
-nl_if_brace 		= remove	# "if () {" vs "if () \n {"
-nl_for_brace 		= remove	# "for () {" vs "for () \n {"
-nl_else_brace 		= remove	# "else {" vs "else \n {"
-nl_while_brace 		= remove	# "while () {" vs "while () \n {"
-nl_switch_brace 	= remove	# "switch () {" vs "switch () \n {"
-nl_brace_while		= remove	# "} while" vs "} \n while" - cuddle while
-nl_brace_else		= remove	# "} else" vs "} \n else" - cuddle else
-nl_func_var_def_blk	= 1
-nl_fcall_brace		= remove	# "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace		= add		# "int foo() {" vs "int foo()\n{"
+nl_enum_brace			= remove	# "enum {" vs "enum \n {"
+nl_union_brace			= remove	# "union {" vs "union \n {"
+nl_struct_brace			= remove	# "struct {" vs "struct \n {"
+nl_do_brace 			= remove	# "do {" vs "do \n {"
+nl_if_brace 			= remove	# "if () {" vs "if () \n {"
+nl_for_brace 			= remove	# "for () {" vs "for () \n {"
+nl_else_brace 			= remove	# "else {" vs "else \n {"
+nl_while_brace 			= remove	# "while () {" vs "while () \n {"
+nl_switch_brace 		= remove	# "switch () {" vs "switch () \n {"
+nl_brace_while			= remove	# "} while" vs "} \n while" - cuddle while
+nl_brace_else			= remove	# "} else" vs "} \n else" - cuddle else
+nl_var_def_blk_end_func_top	= 1
+nl_fcall_brace			= remove	# "list_for_each() {" vs "list_for_each()\n{"
+nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
 # nl_after_return		= TRUE;
 # nl_before_case	= 1
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux.cfg
index af6f3d5d..6e10303c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux.cfg
@@ -14,25 +14,25 @@ indent_label		= 1		# pos: absolute col, neg: relative column
 # inter-symbol newlines
 #
 
-nl_enum_brace		= remove	# "enum {" vs "enum \n {"
-nl_union_brace		= remove	# "union {" vs "union \n {"
-nl_struct_brace		= remove	# "struct {" vs "struct \n {"
-nl_do_brace 		= remove	# "do {" vs "do \n {"
-nl_if_brace 		= remove	# "if () {" vs "if () \n {"
-nl_for_brace 		= remove	# "for () {" vs "for () \n {"
-nl_else_brace 		= remove	# "else {" vs "else \n {"
-nl_while_brace 		= remove	# "while () {" vs "while () \n {"
-nl_switch_brace 	= remove	# "switch () {" vs "switch () \n {"
-nl_brace_while		= remove	# "} while" vs "} \n while" - cuddle while
-nl_brace_else		= remove	# "} else" vs "} \n else" - cuddle else
-sp_brace_else		= force
-sp_else_brace		= force
-nl_func_var_def_blk	= 1
-nl_fcall_brace		= remove	# "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace		= add		# "int foo() {" vs "int foo()\n{"
-nl_after_label_colon	= true		# "fail:\nfree(foo);" vs "fail: free(foo);"
+nl_enum_brace			= remove	# "enum {" vs "enum \n {"
+nl_union_brace			= remove	# "union {" vs "union \n {"
+nl_struct_brace			= remove	# "struct {" vs "struct \n {"
+nl_do_brace 			= remove	# "do {" vs "do \n {"
+nl_if_brace 			= remove	# "if () {" vs "if () \n {"
+nl_for_brace 			= remove	# "for () {" vs "for () \n {"
+nl_else_brace 			= remove	# "else {" vs "else \n {"
+nl_while_brace 			= remove	# "while () {" vs "while () \n {"
+nl_switch_brace 		= remove	# "switch () {" vs "switch () \n {"
+nl_brace_while			= remove	# "} while" vs "} \n while" - cuddle while
+nl_brace_else			= remove	# "} else" vs "} \n else" - cuddle else
+sp_brace_else			= force
+sp_else_brace			= force
+nl_var_def_blk_end_func_top	= 1
+nl_fcall_brace			= remove	# "list_for_each() {" vs "list_for_each()\n{"
+nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
+nl_after_label_colon		= true		# "fail:\nfree(foo);" vs "fail: free(foo);"
 # nl_after_return		= TRUE;
-# nl_before_case	= 1
+# nl_before_case		= 1
 
 
 #
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/mono.cfg
index b7aa9779..43ecdc8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/mono.cfg
@@ -20,7 +20,7 @@ nl_for_brace			= remove	# "for () {" vs "for () \n {"
 nl_else_brace			= remove	# "else {" vs "else \n {"
 nl_while_brace			= remove	# "while () {" vs "while () \n {"
 nl_switch_brace			= remove	# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
+nl_var_def_blk_end_func_top	= 1
 nl_before_case			= 1
 nl_fcall_brace			= remove	# "foo() {" vs "foo()\n{"
 nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/msvc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/msvc.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/msvc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/msvc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/objc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/objc.cfg
index d3321f09..265078b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/objc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/objc.cfg
@@ -19,22 +19,22 @@ indent_switch_case      = indent_columns
 # Inter-symbol newlines
 #
 
-nl_enum_brace         = remove   # "enum {" vs "enum \n {"
-nl_union_brace        = remove   # "union {" vs "union \n {"
-nl_struct_brace       = remove   # "struct {" vs "struct \n {"
-nl_do_brace           = remove   # "do {" vs "do \n {"
-nl_if_brace           = remove   # "if () {" vs "if () \n {"
-nl_for_brace          = remove   # "for () {" vs "for () \n {"
-nl_else_brace         = remove   # "else {" vs "else \n {"
-nl_while_brace        = remove   # "while () {" vs "while () \n {"
-nl_switch_brace       = remove   # "switch () {" vs "switch () \n {"
-nl_brace_while        = remove   # "} while" vs "} \n while" - cuddle while
-nl_brace_else         = remove   # "} else" vs "} \n else" - cuddle else
-nl_func_var_def_blk   = 1
-nl_fcall_brace        = remove   # "list_for_each() {" vs "list_for_each()\n{"
-nl_fdef_brace         = remove   # "int foo() {" vs "int foo()\n{"
-# nl_after_return     = TRUE;
-# nl_before_case      = 1
+nl_enum_brace               = remove   # "enum {" vs "enum \n {"
+nl_union_brace              = remove   # "union {" vs "union \n {"
+nl_struct_brace             = remove   # "struct {" vs "struct \n {"
+nl_do_brace                 = remove   # "do {" vs "do \n {"
+nl_if_brace                 = remove   # "if () {" vs "if () \n {"
+nl_for_brace                = remove   # "for () {" vs "for () \n {"
+nl_else_brace               = remove   # "else {" vs "else \n {"
+nl_while_brace              = remove   # "while () {" vs "while () \n {"
+nl_switch_brace             = remove   # "switch () {" vs "switch () \n {"
+nl_brace_while              = remove   # "} while" vs "} \n while" - cuddle while
+nl_brace_else               = remove   # "} else" vs "} \n else" - cuddle else
+nl_var_def_blk_end_func_top = 1
+nl_fcall_brace              = remove   # "list_for_each() {" vs "list_for_each()\n{"
+nl_fdef_brace               = remove   # "int foo() {" vs "int foo()\n{"
+# nl_after_return           = TRUE;
+# nl_before_case            = 1
 
 
 #
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/sun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/sun.cfg
index 1d6a8887..b1c16263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/sun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/sun.cfg
@@ -1068,7 +1068,7 @@ nl_after_square_assign                    = remove   # ignore/add/remove/force
 
 # The number of blank lines after a block of variable definitions at the top of a function body
 # 0 = No change (default)
-nl_func_var_def_blk                       = 1        # number
+nl_var_def_blk_end_func_top               = 1        # number
 
 # The number of newlines before a block of typedefs
 # 0 = No change (default)
@@ -1716,10 +1716,10 @@ pp_indent_at_level0                       = false    # false/true
 # Default=1.
 pp_indent_count                           = 1        # number
 
-# Add or remove space after # based on pp_level of #if blocks
-pp_space                                  = remove   # ignore/add/remove/force
+# Add or remove space after # based on pp level of #if blocks
+pp_space_after                            = remove   # ignore/add/remove/force
 
-# Sets the number of spaces added with pp_space
+# Sets the number of spaces added with pp_space_after
 pp_space_count                            = 1        # number
 
 # The indent for #region and #endregion in C# and '#pragma region' in C/C++
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/types.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/types.txt
index 0df27c78..0df27c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/types.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/types.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uigui_uncrustify.ini b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uigui_uncrustify.ini
index dfcf033f..80a27c58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uigui_uncrustify.ini
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uigui_uncrustify.ini
@@ -15,7 +15,7 @@ parameterOrder=ipo
 showHelpParameter=-h
 stringparaminquotes=false
 useCfgFileParameter="-c "
-version=Uncrustify-0.75.0
+version=Uncrustify-0.76.0
 
 [Newlines]
 Category=0
@@ -1002,7 +1002,7 @@ ValueDefault=remove
 
 [Sp After Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</html>"
+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
@@ -1011,7 +1011,7 @@ ValueDefault=ignore
 
 [Sp Before Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
+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
@@ -1020,7 +1020,7 @@ ValueDefault=ignore
 
 [Sp Between Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
+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
@@ -2269,7 +2269,7 @@ ValueDefault=ignore
 
 [Sp Inside Newop Paren]
 Category=1
-Description="<html>Add or remove space inside parenthesis of the new operator<br/>as in 'new(foo) BAR'.</html>"
+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
@@ -3339,7 +3339,7 @@ ValueDefault=true
 
 [Indent Ternary Operator]
 Category=2
-Description="<html>How to indent the continuation of ternary operator.<br/><br/>0: Off (default)<br/>1: When the `if_false` is a continuation, indent it under `if_false`<br/>2: When the `:` is a continuation, indent it under `?`</html>"
+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="
@@ -3397,12 +3397,20 @@ ValueDefault=false
 
 [Nl Collapse Empty Body]
 Category=3
-Description="<html>Whether to collapse empty blocks between '{' and '}'.<br/>If true, overrides nl_inside_empty_func</html>"
+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
 ValueDefault=false
 
+[Nl Collapse Empty Body Functions]
+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
+ValueDefault=false
+
 [Nl Assign Leave One Liners]
 Category=3
 Description="<html>Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.</html>"
@@ -4536,6 +4544,26 @@ EditorType=boolean
 TrueFalse=nl_oc_msg_args=true|nl_oc_msg_args=false
 ValueDefault=false
 
+[Nl Oc Msg Args Min Params]
+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="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Oc Msg Args Max Code Width]
+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="
+MinVal=0
+MaxVal=10000
+ValueDefault=0
+
 [Nl Fdef Brace]
 Category=3
 Description="<html>Add or remove newline between function signature and '{'.</html>"
@@ -4572,6 +4600,15 @@ Choices=nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return
 ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
 ValueDefault=ignore
 
+[Nl Throw Expr]
+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
+ChoicesReadable="Ignore Nl Throw Expr|Add Nl Throw Expr|Remove Nl Throw Expr|Force Nl Throw Expr"
+ValueDefault=ignore
+
 [Nl After Semicolon]
 Category=3
 Description="<html>Whether to add a newline after semicolons, except in 'for' statements.</html>"
@@ -4999,7 +5036,7 @@ ValueDefault=0
 
 [Nl Inside Empty Func]
 Category=4
-Description="<html>The number of newlines inside an empty function body.<br/>This option overrides eat_blanks_after_open_brace and<br/>eat_blanks_before_close_brace, but is ignored when<br/>nl_collapse_empty_body=true</html>"
+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="
@@ -5125,16 +5162,6 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl Func Var Def Blk]
-Category=4
-Description="<html>The number of blank lines after a block of variable definitions at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_func_var_def_blk="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
 [Nl Typedef Blk Start]
 Category=4
 Description="<html>The number of newlines before a block of typedefs. If nl_after_access_spec<br/>is non-zero, that option takes precedence.<br/><br/>0: No change (default).</html>"
@@ -5165,9 +5192,19 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
+[Nl Var Def Blk End Func Top]
+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="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
 [Nl Var Def Blk Start]
 Category=4
-Description="<html>The 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.<br/><br/>0: No change (default).</html>"
+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="
@@ -5177,7 +5214,7 @@ ValueDefault=0
 
 [Nl Var Def Blk End]
 Category=4
-Description="<html>The number of empty newlines after a block of variable definitions<br/>not at the top of a function body.<br/><br/>0: No change (default).</html>"
+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="
@@ -5836,16 +5873,6 @@ MinVal=0
 MaxVal=5000
 ValueDefault=0
 
-[Align Braced Init List Span]
-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="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
 [Align Assign Func Proto Span]
 Category=7
 Description="<html>The span for aligning on '=' in function prototype modifier.<br/><br/>0: Don't align (default).</html>"
@@ -5874,6 +5901,16 @@ EditorType=boolean
 TrueFalse=align_assign_on_multi_var_defs=true|align_assign_on_multi_var_defs=false
 ValueDefault=false
 
+[Align Braced Init List Span]
+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="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
 [Align Braced Init List Thresh]
 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>"
@@ -6612,13 +6649,22 @@ ValueDefault=false
 
 [Mod Paren On Return]
 Category=9
-Description="<html>Add or remove unnecessary parenthesis on 'return' statement.</html>"
+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
 ChoicesReadable="Ignore Mod Paren On Return|Add Mod Paren On Return|Remove Mod Paren On Return|Force Mod Paren On Return"
 ValueDefault=ignore
 
+[Mod Paren On Throw]
+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
+ChoicesReadable="Ignore Mod Paren On Throw|Add Mod Paren On Throw|Remove Mod Paren On Throw|Force Mod Paren On Throw"
+ValueDefault=ignore
+
 [Mod Pawn Semicolon]
 Category=9
 Description="<html>(Pawn) Whether to change optional semicolons to real semicolons.</html>"
@@ -6841,6 +6887,96 @@ Choices=mod_enum_last_comma=ignore|mod_enum_last_comma=add|mod_enum_last_comma=r
 ChoicesReadable="Ignore Mod Enum Last Comma|Add Mod Enum Last Comma|Remove Mod Enum Last Comma|Force Mod Enum Last Comma"
 ValueDefault=ignore
 
+[Mod Infinite Loop]
+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="
+MinVal=0
+MaxVal=5
+ValueDefault=0
+
+[Mod Int Short]
+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
+ChoicesReadable="Ignore Mod Int Short|Add Mod Int Short|Remove Mod Int Short|Force Mod Int Short"
+ValueDefault=ignore
+
+[Mod Short Int]
+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
+ChoicesReadable="Ignore Mod Short Int|Add Mod Short Int|Remove Mod Short Int|Force Mod Short Int"
+ValueDefault=ignore
+
+[Mod Int Long]
+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
+ChoicesReadable="Ignore Mod Int Long|Add Mod Int Long|Remove Mod Int Long|Force Mod Int Long"
+ValueDefault=ignore
+
+[Mod Long Int]
+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
+ChoicesReadable="Ignore Mod Long Int|Add Mod Long Int|Remove Mod Long Int|Force Mod Long Int"
+ValueDefault=ignore
+
+[Mod Int Signed]
+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
+ChoicesReadable="Ignore Mod Int Signed|Add Mod Int Signed|Remove Mod Int Signed|Force Mod Int Signed"
+ValueDefault=ignore
+
+[Mod Signed Int]
+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
+ChoicesReadable="Ignore Mod Signed Int|Add Mod Signed Int|Remove Mod Signed Int|Force Mod Signed Int"
+ValueDefault=ignore
+
+[Mod Int Unsigned]
+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
+ChoicesReadable="Ignore Mod Int Unsigned|Add Mod Int Unsigned|Remove Mod Int Unsigned|Force Mod Int Unsigned"
+ValueDefault=ignore
+
+[Mod Unsigned Int]
+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
+ChoicesReadable="Ignore Mod Unsigned Int|Add Mod Unsigned Int|Remove Mod Unsigned Int|Force Mod Unsigned Int"
+ValueDefault=ignore
+
+[Mod Int Prefer Int On Left]
+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
+ValueDefault=false
+
 [Mod Sort Oc Properties]
 Category=9
 Description="<html>(OC) Whether to organize the properties. If true, properties will be<br/>rearranged according to the mod_sort_oc_property_*_weight factors.</html>"
@@ -6919,6 +7055,16 @@ MinVal=
 MaxVal=
 ValueDefault=0
 
+[Pp Indent With Tabs]
+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="
+MinVal=-1
+MaxVal=2
+ValueDefault=-1
+
 [Pp Indent]
 Category=10
 Description="<html>Add or remove indentation of preprocessor directives inside #if blocks<br/>at brace level 0 (file-level).</html>"
@@ -6954,18 +7100,18 @@ MinVal=0
 MaxVal=16
 ValueDefault=1
 
-[Pp Space]
+[Pp Space After]
 Category=10
-Description="<html>Add or remove space after # based on pp_level of #if blocks.</html>"
+Description="<html>Add or remove space after # based on pp level of #if blocks.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force|pp_space=not_defined
-ChoicesReadable="Ignore Pp Space|Add Pp Space|Remove Pp Space|Force Pp Space"
+Choices=pp_space_after=ignore|pp_space_after=add|pp_space_after=remove|pp_space_after=force|pp_space_after=not_defined
+ChoicesReadable="Ignore Pp Space After|Add Pp Space After|Remove Pp Space After|Force Pp Space After"
 ValueDefault=ignore
 
 [Pp Space Count]
 Category=10
-Description="<html>Sets the number of spaces per level added with pp_space.</html>"
+Description="<html>Sets the number of spaces per level added with pp_space_after.</html>"
 Enabled=false
 EditorType=numeric
 CallName="pp_space_count="
@@ -7041,9 +7187,19 @@ EditorType=boolean
 TrueFalse=pp_ignore_define_body=true|pp_ignore_define_body=false
 ValueDefault=false
 
+[Pp Multiline Define Body Indent]
+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="
+MinVal=-32
+MaxVal=32
+ValueDefault=8
+
 [Pp Indent Case]
 Category=10
-Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the case statements<br/>directly inside of.<br/><br/>Default: true</html>"
+Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the 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
@@ -7051,7 +7207,7 @@ ValueDefault=true
 
 [Pp Indent Func Def]
 Category=10
-Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the function definition<br/>is directly inside of.<br/><br/>Default: true</html>"
+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
@@ -7059,7 +7215,7 @@ ValueDefault=true
 
 [Pp Indent Extern]
 Category=10
-Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the extern block is<br/>directly inside of.<br/><br/>Default: true</html>"
+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
@@ -7067,7 +7223,7 @@ ValueDefault=true
 
 [Pp Indent Brace]
 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/>preprocesser 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>"
+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="
@@ -7125,7 +7281,7 @@ ValueDefault=false
 
 [Indent Cpp Lambda Only Once]
 Category=12
-Description="<html>The indentation can be:<br/>- after the assignment, at the '[' character<br/>- at the begin of the lambda body<br/><br/>true:  indentation will be after the assignment<br/>false: indentation will be at the begin of the lambda body (default)</html>"
+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
@@ -7204,3 +7360,27 @@ CallName="debug_truncate="
 MinVal=0
 MaxVal=960
 ValueDefault=0
+
+[Debug Sort The Tracks]
+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
+ValueDefault=true
+
+[Debug Decode The Flags]
+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
+ValueDefault=false
+
+[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
+ValueDefault=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrust-files.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrust-files.sh
index 3e1d09b3..3e1d09b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrust-files.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrust-files.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrustify.xml.in b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrustify.xml.in
index 33f6c6a5..33f6c6a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrustify.xml.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrustify.xml.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/xsupplicant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/xsupplicant.cfg
index 45d16fa6..66a93d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/xsupplicant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/xsupplicant.cfg
@@ -19,7 +19,7 @@ nl_for_brace			= add		# "for () {" vs "for () \n {"
 nl_else_brace			= add		# "else {" vs "else \n {"
 nl_while_brace			= add		# "while () {" vs "while () \n {"
 nl_switch_brace			= add		# "switch () {" vs "switch () \n {"
-nl_func_var_def_blk		= 1
+nl_var_def_blk_end_func_top	= 1
 nl_before_case			= 1
 nl_fcall_brace			= add		# "foo() {" vs "foo()\n{"
 nl_fdef_brace			= add		# "int foo() {" vs "int foo()\n{"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/extras.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/extras.vpj
index 4b57772a..4b57772a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/extras.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/extras.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.cfg
index 12dca2a2..1f115593 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.cfg
@@ -139,7 +139,6 @@ nl_func_proto_type_name                   = remove
 nl_func_scope_name                        = remove
 nl_func_type_name                         = remove
 nl_func_type_name_class                   = remove
-nl_func_var_def_blk                       = 1
 nl_getset_leave_one_liners                = true
 nl_if_brace                               = add
 nl_inside_empty_func                      = 1
@@ -156,6 +155,7 @@ nl_type_brace_init_lst                    = force
 nl_type_brace_init_lst_close              = force
 nl_type_brace_init_lst_open               = force
 nl_union_brace                            = add
+nl_var_def_blk_end_func_top               = 1
 nl_while_brace                            = add
 
 # Positioning options
@@ -166,7 +166,8 @@ pos_enum_comma                            = trail_force
 
 # Preprocessor options
 pp_indent                                 = remove
-pp_space                                  = remove
+pp_space_after                            = remove
+pp_multiline_define_body_indent           = 3
 
 # Spacing options
 sp_addr                                   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.txt
index 5beb747f..6385ab7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.txt
@@ -10,24 +10,24 @@ About the comments:
 While a line is indented, the comment at the end of the line stays at the original column.
 
 If we have:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))
+      else if ((pc->GetType() == CT_FUNC_CLASS_DEF) ||
+               (pc->GetType() == CT_FUNC_DEF) ||
+               (pc->GetType() == CT_FUNC_CLASS_PROTO) ||
+               (pc->GetType() == CT_FUNC_PROTO))
       {                  // guy 2016-04-16
 
 where the brace { is at new line with a comment.
 The option nl_elseif_brace = remove
 gives:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-                 (pc->type == CT_FUNC_DEF) ||
-                 (pc->type == CT_FUNC_CLASS_PROTO) ||
-                 (pc->type == CT_FUNC_PROTO)) { // guy 2016-04-16
+      else if ((pc->GetType() == CT_FUNC_CLASS_DEF) ||
+                 (pc->GetType() == CT_FUNC_DEF) ||
+                 (pc->GetType() == CT_FUNC_CLASS_PROTO) ||
+                 (pc->GetType() == CT_FUNC_PROTO)) { // guy 2016-04-16
 If using at new the same option again with a new value
 nl_elseif_brace = add
 is not able to reconstruct the original source. The comment has changed the line:
-      else if ((pc->type == CT_FUNC_CLASS_DEF) ||
-               (pc->type == CT_FUNC_DEF) ||
-               (pc->type == CT_FUNC_CLASS_PROTO) ||
-               (pc->type == CT_FUNC_PROTO))       // guy 2016-04-16
+      else if ((pc->GetType() == CT_FUNC_CLASS_DEF) ||
+               (pc->GetType() == CT_FUNC_DEF) ||
+               (pc->GetType() == CT_FUNC_CLASS_PROTO) ||
+               (pc->GetType() == CT_FUNC_PROTO))       // guy 2016-04-16
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/ChunkStack.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/ChunkStack.lnt
index cea5860f..cea5860f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/ChunkStack.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/ChunkStack.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/align.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/align.lnt
index 32e388c3..32e388c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/align.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/align.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/chunk_list.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/chunk_list.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/chunk_list.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/chunk_list.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/logger.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/logger.lnt
index e41a1282..e41a1282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/logger.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/logger.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/readme.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/readme.txt
index f2534349..f2534349 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/readme.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/readme.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/unc_text.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/unc_text.lnt
index 89cb4fdb..89cb4fdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/unc_text.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/unc_text.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/uncrustify_types.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/uncrustify_types.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/uncrustify_types.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/uncrustify_types.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/man/uncrustify.1.in b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/man/uncrustify.1.in
index 41267296..41267296 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/man/uncrustify.1.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/man/uncrustify.1.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/osx/Xcode Organizer Actions.xccommands b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/osx/Xcode Organizer Actions.xccommands
index be727021..be727021 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/osx/Xcode Organizer Actions.xccommands
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/osx/Xcode Organizer Actions.xccommands
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/package.json b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/package.json
index 48f9b7c5..f8fcb2a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/package.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uncrustify",
-  "version": "0.75.0",
+  "version": "0.76.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.75.0/release-process.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/release-process.rst
index f16173a1..c208330a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/release-process.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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 2021-05-12, for Uncrustify 0.73.0.*
+*This document was last updated on 2022-11-22, for Uncrustify 0.76.0.*
 
 This document uses "0.1.2" throughout as an example version number.
 Whenever you see this, you should substitute the version number
@@ -44,7 +44,7 @@ Preparing a Candidate
 
 The first step, obviously, is deciding to make a release.
 Prior to making a release, verify that the repository is in a stable state
-and that all CI (continuous integration - Travis and AppVeyor) has passed.
+and that all CI (continuous integration - AppVeyor) has passed.
 This should ensure all tests pass and building
 (including cross-compiling) for Windows is working.
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Gcov_test.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Gcov_test.sh
index a3853773..a3853773 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Gcov_test.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Gcov_test.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Run_clang-tidy.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Run_clang-tidy.sh
index c2f1c150..c2f1c150 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Run_clang-tidy.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Run_clang-tidy.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/add_test_list.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/add_test_list.awk
index 1fbe2840..1fbe2840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/add_test_list.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/add_test_list.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/check_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/check_options.py
index 1d32224b..1d32224b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/check_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/check_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/cmpcfg.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/cmpcfg.pl
index df119dc1..df119dc1 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/cmpcfg.pl
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/cmpcfg.pl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/compare_the_gcov.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/compare_the_gcov.awk
index 30dba1ad..30dba1ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/compare_the_gcov.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/compare_the_gcov.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_changelog.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_changelog.py
index 8e042385..8e042385 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_changelog.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_changelog.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output.py
index 2fa4fb0c..2fa4fb0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output_example.json b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output_example.json
index 315fdfef..315fdfef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output_example.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output_example.json
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/grammar_permutator.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/grammar_permutator.py
index cd42bd9f..cd42bd9f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/grammar_permutator.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/grammar_permutator.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_katehl.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_katehl.py
index e241986a..e241986a 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_katehl.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_katehl.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_option_enum.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_option_enum.py
index c141bb04..c141bb04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_option_enum.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_option_enum.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_options.py
index 71e97115..71e97115 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_punctuator_table.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_punctuator_table.py
index f3d90081..f3d90081 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_punctuator_table.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_punctuator_table.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_version.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_version.py
index 14e20018..14e20018 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_version.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_version.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/option_reducer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/option_reducer.py
index 403ff92b..403ff92b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/option_reducer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/option_reducer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/au-sm123.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/au-sm123.lnt
index 6eaf9a6b..6eaf9a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/au-sm123.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/au-sm123.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.h
index e948a20f..e948a20f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.lnt
index f7bd38dd..f7bd38dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/lint_cfg.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/lint_cfg.lnt
index 72530d53..72530d53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/lint_cfg.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/lint_cfg.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/pclint_cfg_eclipse.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/pclint_cfg_eclipse.lnt
index d1945c5b..d1945c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/pclint_cfg_eclipse.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/pclint_cfg_eclipse.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/policy.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/policy.lnt
index 911e74b7..911e74b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/policy.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/policy.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/run-pclint-eclipse.bat b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/run-pclint-eclipse.bat
index 051813d6..051813d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/run-pclint-eclipse.bat
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/run-pclint-eclipse.bat
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/usage.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/usage.txt
index fff1c305..fff1c305 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/usage.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/usage.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/prepare_list_of_authors.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/prepare_list_of_authors.sh
index 6485d377..4151ef8a 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/prepare_list_of_authors.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/prepare_list_of_authors.sh
@@ -2,7 +2,7 @@
 #
 # Prepare the list of authors
 # guy maurel
-# 2020-11-05
+# 2022-11-22
 #
 LIST_1="TheListOfAuthors.txt"
 echo "Author:"                    > ${LIST_1}
@@ -10,9 +10,10 @@ echo "2005 - 2016 : Ben Gardner" >> ${LIST_1}
 echo ""                          >> ${LIST_1}
 echo "Maintenance:"              >> ${LIST_1}
 echo "Guy Maurel"                >> ${LIST_1}
+echo "Michele Calgaro"           >> ${LIST_1}
 echo "Matthew Woehlke"           >> ${LIST_1}
 echo ""                          >> ${LIST_1}
-echo "until 2020-11-05:"         >> ${LIST_1}
+echo "until 2022-11-22:"         >> ${LIST_1}
 echo "Other collaborators:"      >> ${LIST_1}
 git log --format='%aN' \
    | sort -u \
@@ -26,12 +27,17 @@ git log --format='%aN' \
    | grep -v "^brmqk3$" \
    | grep -v "^csobeski$" \
    | grep -v "^dbeard$" \
+   | grep -v "^dundargoc$" \
+   | grep -v "^fwojcik$" \
    | grep -v "^gmaurel$" \
    | grep -v "^hdwobben$" \
    | grep -v "^ipaterson$" \
    | grep -v "^jlee975$" \
    | grep -v "^logan.gauthier@metova.com$" \
+   | grep -v "^micheleCTDE$" \
+   | grep -v "^micheleCTDEAdmin$" \
    | grep -v "^nivekkagicom$" \
+   | grep -v "^Pawel Benetkiewicz$" \
    | grep -v "^popipo$" \
    | grep -v "^raefaldhia$" \
    | grep -v "^rdan$" \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/release_tool.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/release_tool.py
index 2dd71676..b90f543b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/release_tool.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/release_tool.py
@@ -207,7 +207,7 @@ def main():
 
     parser_update = subparsers.add_parser(
         'update', help='update version information')
-    parser_update.set_defaults(func=cmd_update)
+    parser_update.set_defaults(func=cmd_update, keepversion=False)
     parser_update.add_argument('executable',
                                help='path to uncrustify executable')
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/run_ctest.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/run_ctest.py
index 0267e0ad..0267e0ad 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/run_ctest.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/run_ctest.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/tokenizer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/tokenizer.py
index 0bc33bac..0bc33bac 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/tokenizer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/tokenizer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/update_emscripten_bindings.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/update_emscripten_bindings.py
index 781311e2..781311e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/update_emscripten_bindings.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/update_emscripten_bindings.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/.kateconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/.kateconfig
index 4d9024f0..4d9024f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/.kateconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/.kateconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.cpp
index dfa0f888..dfa0f888 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.h
index b33e1dd5..b33e1dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.cpp
index 02536aa4..d1c7bc67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.cpp
@@ -18,7 +18,6 @@
  * Extern declarations
  */
 extern const char *get_token_name(E_Token);
-extern void log_pcf_flags(log_sev_t, pcf_flags_t);
 
 
 /**
@@ -41,8 +40,8 @@ static bool adj_tokens_match_qualified_identifier_pattern(Chunk *prev, Chunk *ne
    if (  prev != nullptr
       && next != nullptr)
    {
-      auto prev_token_type = prev->type;
-      auto next_token_type = next->type;
+      auto prev_token_type = prev->GetType();
+      auto next_token_type = next->GetType();
 
       switch (prev_token_type)
       {
@@ -59,7 +58,7 @@ static bool adj_tokens_match_qualified_identifier_pattern(Chunk *prev, Chunk *ne
           * templated type, just check to see if there's a matching closing
           * angle
           */
-         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
+         return(prev->GetClosingParen(E_Scope::PREPROC)->IsNotNullChunk());
 
       case CT_DC_MEMBER:
          /**
@@ -102,8 +101,8 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
    if (  prev != nullptr
       && next != nullptr)
    {
-      auto prev_token_type = prev->type;
-      auto next_token_type = next->type;
+      auto prev_token_type = prev->GetType();
+      auto next_token_type = next->GetType();
 
       switch (prev_token_type)
       {
@@ -117,7 +116,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - a qualifier (const, etc.)
           * - an identifier
           */
-         return(  chunk_is_pointer_or_reference(next)
+         return(  next->IsPointerOrReference()
                || next_token_type == CT_DC_MEMBER
                || next_token_type == CT_QUALIFIER
                || next_token_type == CT_WORD);
@@ -129,7 +128,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * templated type, just check to see if there's a matching closing
           * angle
           */
-         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
+         return(prev->GetClosingParen(E_Scope::PREPROC)->IsNotNullChunk());
 
       case CT_BRACE_CLOSE:
          /**
@@ -142,7 +141,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - a qualifier (const, etc.)
           * - an identifier
           */
-         return(  chunk_is_pointer_or_reference(next)
+         return(  next->IsPointerOrReference()
                || next_token_type == CT_QUALIFIER
                || next_token_type == CT_WORD);
 
@@ -152,7 +151,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * start of a braced initializer list - skip ahead to find a matching
           * closing brace
           */
-         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
+         return(prev->GetClosingParen(E_Scope::PREPROC)->IsNotNullChunk());
 
       case CT_BYREF:
          /**
@@ -171,7 +170,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - an identifier
           */
          return(  language_is_set(LANG_CPP)
-               && (  chunk_is_pointer_or_reference(next)
+               && (  next->IsPointerOrReference()
                   || next_token_type == CT_QUALIFIER
                   || next_token_type == CT_WORD));
 
@@ -184,7 +183,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - a reference symbol ('&')
           * - an identifier
           */
-         return(  chunk_is_pointer_or_reference(next)
+         return(  next->IsPointerOrReference()
                || next_token_type == CT_WORD);
 
       case CT_DC_MEMBER:
@@ -202,11 +201,11 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * start of a constructor call parameter list - skip ahead to find a
           * matching closing paren
           */
-         next = chunk_skip_to_match(prev, E_Scope::PREPROC);
+         next = prev->GetClosingParen(E_Scope::PREPROC);
 
-         if (next != nullptr)
+         if (next->IsNotNullChunk())
          {
-            next_token_type = next->type;
+            next_token_type = next->GetType();
          }
          return(next_token_type == CT_PAREN_CLOSE);
 
@@ -219,7 +218,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - a qualifier (const, etc.)
           * - an identifier
           */
-         return(  chunk_is_pointer_or_reference(next)
+         return(  next->IsPointerOrReference()
                || next_token_type == CT_QUALIFIER
                || next_token_type == CT_WORD);
 
@@ -232,7 +231,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - another qualifier
           * - an identifier
           */
-         return(  chunk_is_pointer_or_reference(next)
+         return(  next->IsPointerOrReference()
                || next_token_type == CT_QUALIFIER
                || next_token_type == CT_WORD);
 
@@ -248,7 +247,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * if the previous token is an opening bracket, it may indicate an
           * array declaration - skip ahead to find a matching closing bracket
           */
-         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
+         return(prev->GetClosingParen(E_Scope::PREPROC)->IsNotNullChunk());
 
       case CT_STAR:
          /**
@@ -259,7 +258,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - a qualifier (const, etc.)
           * - an identifier
           */
-         return(  chunk_is_pointer_or_reference(next)
+         return(  next->IsPointerOrReference()
                || next_token_type == CT_QUALIFIER
                || next_token_type == CT_WORD);
 
@@ -282,7 +281,7 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
           * - a qualifier (const, etc.)
           * - an identifier
           */
-         return(  chunk_is_pointer_or_reference(next)
+         return(  next->IsPointerOrReference()
                || next_token_type == CT_ANGLE_OPEN
                || next_token_type == CT_DC_MEMBER
                || next_token_type == CT_QUALIFIER
@@ -341,10 +340,10 @@ static bool chunk_is_after(Chunk *pc, Chunk *after, bool test_equal = true)
       }
       else if (after != nullptr)
       {
-         auto pc_column    = pc->orig_col;
-         auto pc_line      = pc->orig_line;
-         auto after_column = after->orig_col;
-         auto after_line   = after->orig_line;
+         auto pc_column    = pc->GetOrigCol();
+         auto pc_line      = pc->GetOrigLine();
+         auto after_column = after->GetOrigCol();
+         auto after_line   = after->GetOrigLine();
 
          return(  pc_line > after_line
                || (  pc_line == after_line
@@ -376,10 +375,10 @@ static bool chunk_is_before(Chunk *pc, Chunk *before, bool test_equal = true)
       }
       else if (before != nullptr)
       {
-         auto pc_column     = pc->orig_col;
-         auto pc_line       = pc->orig_line;
-         auto before_column = before->orig_col;
-         auto before_line   = before->orig_line;
+         auto pc_column     = pc->GetOrigCol();
+         auto pc_line       = pc->GetOrigLine();
+         auto before_column = before->GetOrigCol();
+         auto before_line   = before->GetOrigLine();
 
          return(  pc_line < before_line
                || (  pc_line == before_line
@@ -421,36 +420,31 @@ static bool chunk_is_macro_reference(Chunk *pc)
 
    if (  (  language_is_set(LANG_CPP)
          || language_is_set(LANG_C))
-      && chunk_is_token(pc, CT_WORD)
-      && !pc->flags.test(PCF_IN_PREPROC))
+      && pc->Is(CT_WORD)
+      && !pc->TestFlags(PCF_IN_PREPROC))
    {
-      while (  next != nullptr
-            && next->IsNotNullChunk())
+      while (next->IsNotNullChunk())
       {
-         if (  next->flags.test(PCF_IN_PREPROC)
-            && std::strcmp(pc->str.c_str(), next->str.c_str()) == 0)
+         if (  next->TestFlags(PCF_IN_PREPROC)
+            && std::strcmp(pc->GetStr().c_str(), next->GetStr().c_str()) == 0)
          {
             return(true);
          }
-         next = chunk_search_next_cat(next, CT_MACRO);
+         next = next->GetNextType(CT_MACRO);
       }
    }
    return(false);
 } // chunk_is_macro_reference
 
 
-/**
- * Returns true if the input chunk is a pointer/reference operator or a
- * qualifier
- */
-static bool chunk_is_pointer_reference_or_qualifier(Chunk *pc)
+bool Chunk::IsPointerReferenceOrQualifier() const
 {
    LOG_FUNC_ENTRY();
 
-   return(  chunk_is_pointer_or_reference(pc)
-         || (  chunk_is_token(pc, CT_QUALIFIER)
-            && !chunk_is_cpp_inheritance_access_specifier(pc)));
-} // chunk_is_pointer_reference_or_qualifier
+   return(  IsPointerOrReference()
+         || (  Is(CT_QUALIFIER)
+            && !IsCppInheritanceAccessSpecifier()));
+}
 
 
 /**
@@ -476,9 +470,9 @@ static std::pair<Chunk *, Chunk *> match_qualified_identifier(Chunk *pc)
    if (  end != nullptr
       && start != nullptr)
    {
-      auto *double_colon = chunk_search_next_cat(start, CT_DC_MEMBER);
+      auto *double_colon = start->GetNextType(CT_DC_MEMBER);
 
-      if (  double_colon != nullptr
+      if (  double_colon->IsNotNullChunk()
          && chunk_is_between(double_colon, start, end))
       {
          return(std::make_pair(start, end));
@@ -518,7 +512,7 @@ static std::tuple<Chunk *, Chunk *, Chunk *> match_variable(Chunk *pc, std::size
    if (  identifier->IsNotNullChunk()
       && start->IsNotNullChunk()
       && (  end != nullptr
-         || chunk_is_token(identifier->GetPrevNcNnlNi(), CT_WORD)))
+         || identifier->GetPrevNcNnlNi()->Is(CT_WORD)))
    {
       return(std::make_tuple(start, identifier, end));
    }
@@ -555,7 +549,7 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
        */
       Chunk *rhs_exp_end = nullptr;
 
-      if (chunk_is_token(pc, CT_ASSIGN))
+      if (pc->Is(CT_ASSIGN))
       {
          /**
           * store a pointer to the end chunk of the rhs expression;
@@ -570,7 +564,7 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
        */
       while (  pc != nullptr
             && pc->IsNotNullChunk()
-            && pc->level > level)
+            && pc->GetLevel() > level)
       {
          pc = pc->GetNextNcNnl();
       }
@@ -579,12 +573,12 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
        * skip to any following match for angle brackets, braces, parens,
        * or square brackets
        */
-      if (  chunk_is_token(pc, CT_ANGLE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_paren_open(pc)
-         || chunk_is_token(pc, CT_SQUARE_OPEN))
+      if (  pc->Is(CT_ANGLE_OPEN)
+         || pc->Is(CT_BRACE_OPEN)
+         || pc->IsParenOpen()
+         || pc->Is(CT_SQUARE_OPEN))
       {
-         pc = chunk_skip_to_match(pc, E_Scope::PREPROC);
+         pc = pc->GetClosingParen(E_Scope::PREPROC);
       }
       /**
        * call a separate function to validate adjacent tokens as potentially
@@ -593,19 +587,18 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
 
       Chunk *next = pc->GetNextNcNnl();
 
-      if (  chunk_is_not_token(next, CT_COMMA)
-         && chunk_is_not_token(next, CT_FPAREN_CLOSE)
-         && !chunk_is_semicolon(next)
+      if (  next->IsNot(CT_COMMA)
+         && next->IsNot(CT_FPAREN_CLOSE)
+         && !next->IsSemicolon()
          && !adj_tokens_match_var_def_pattern(pc, next))
       {
          /**
           * error, pattern is not consistent with a variable declaration/definition
           */
-
          break;
       }
 
-      if (  chunk_is_token(pc, CT_WORD)
+      if (  pc->Is(CT_WORD)
          && pc != rhs_exp_end)
       {
          /**
@@ -619,9 +612,9 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
        * we're done searching if we've previously identified a variable name
        * and then encounter a comma or semicolon
        */
-      if (  chunk_is_token(next, CT_COMMA)
-         || chunk_is_token(next, CT_FPAREN_CLOSE)
-         || chunk_is_semicolon(next))
+      if (  next->Is(CT_COMMA)
+         || next->Is(CT_FPAREN_CLOSE)
+         || next->IsSemicolon())
       {
          return(std::make_pair(identifier, pc));
       }
@@ -673,7 +666,7 @@ static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t l
          next = prev;
          prev = next->GetPrevNcNnlNi();
 
-         if (chunk_is_token(next, CT_ASSIGN))
+         if (next->Is(CT_ASSIGN))
          {
             pc = prev;
          }
@@ -683,7 +676,7 @@ static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t l
        */
 
       while (  pc->IsNotNullChunk()
-            && pc->level > level)
+            && pc->GetLevel() > level)
       {
          pc = pc->GetPrevNcNnlNi();
       }
@@ -692,12 +685,12 @@ static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t l
        * skip to any preceding match for angle brackets, braces, parens,
        * or square brackets
        */
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_paren_close(pc)
-         || chunk_is_token(pc, CT_SQUARE_CLOSE))
+      if (  pc->Is(CT_ANGLE_CLOSE)
+         || pc->Is(CT_BRACE_CLOSE)
+         || pc->IsParenClose()
+         || pc->Is(CT_SQUARE_CLOSE))
       {
-         pc = chunk_skip_to_match_rev(pc, E_Scope::PREPROC);
+         pc = pc->GetOpeningParen(E_Scope::PREPROC);
       }
       /**
        * call a separate function to validate adjacent tokens as potentially
@@ -712,9 +705,9 @@ static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t l
           * perhaps the previous chunk possibly indicates a type that yet to be
           * marked? if not, then break
           */
-         if (  chunk_is_not_token(prev, CT_WORD)
-            || (  !chunk_is_pointer_or_reference(pc)
-               && chunk_is_not_token(pc, CT_WORD)))
+         if (  prev->IsNot(CT_WORD)
+            || (  !pc->IsPointerOrReference()
+               && pc->IsNot(CT_WORD)))
          {
             /**
              * error, pattern is not consistent with a variable declaration/definition
@@ -725,7 +718,7 @@ static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t l
       }
 
       if (  identifier->IsNullChunk()
-         && chunk_is_token(pc, CT_WORD))
+         && pc->Is(CT_WORD))
       {
          /**
           * we've encountered a candidate for the variable name
@@ -739,11 +732,11 @@ static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t l
        * and then encounter another identifier, or we encounter a closing
        * brace (which would likely indicate an inline variable definition)
        */
-      if (  chunk_is_token(prev, CT_ANGLE_CLOSE)
-         || chunk_is_token(prev, CT_BRACE_CLOSE)
-         || chunk_is_token(prev, CT_COMMA)
-         || chunk_is_token(prev, CT_TYPE)
-         || chunk_is_token(prev, CT_WORD))
+      if (  prev->Is(CT_ANGLE_CLOSE)
+         || prev->Is(CT_BRACE_CLOSE)
+         || prev->Is(CT_COMMA)
+         || prev->Is(CT_TYPE)
+         || prev->Is(CT_WORD))
       {
          return(std::make_pair(pc, identifier));
       }
@@ -764,20 +757,19 @@ static Chunk *skip_scope_resolution_and_nested_name_specifiers(Chunk *pc)
    LOG_FUNC_ENTRY();
 
    if (  (  pc != nullptr
-         && pc->flags.test(PCF_IN_TEMPLATE))
-      || chunk_is_token(pc, CT_DC_MEMBER)
-      || chunk_is_token(pc, CT_TYPE)
-      || chunk_is_token(pc, CT_WORD))
+         && pc->TestFlags(PCF_IN_TEMPLATE))
+      || pc->Is(CT_DC_MEMBER)
+      || pc->Is(CT_TYPE)
+      || pc->Is(CT_WORD))
    {
-      while (  pc != nullptr
-            && pc->IsNotNullChunk())
+      while (pc->IsNotNullChunk())
       {
          /**
           * skip to any following match for angle brackets
           */
-         if (chunk_is_token(pc, CT_ANGLE_OPEN))
+         if (pc->Is(CT_ANGLE_OPEN))
          {
-            pc = chunk_skip_to_match(pc, E_Scope::PREPROC);
+            pc = pc->GetClosingParen(E_Scope::PREPROC);
          }
          Chunk *next = pc->GetNextNcNnl();
 
@@ -811,19 +803,19 @@ static Chunk *skip_scope_resolution_and_nested_name_specifiers_rev(Chunk *pc)
    }
 
    if (  (  pc->IsNotNullChunk()
-         && pc->flags.test(PCF_IN_TEMPLATE))
-      || chunk_is_token(pc, CT_DC_MEMBER)
-      || chunk_is_token(pc, CT_TYPE)
-      || chunk_is_token(pc, CT_WORD))
+         && pc->TestFlags(PCF_IN_TEMPLATE))
+      || pc->Is(CT_DC_MEMBER)
+      || pc->Is(CT_TYPE)
+      || pc->Is(CT_WORD))
    {
       while (pc->IsNotNullChunk())
       {
          /**
           * skip to any preceding match for angle brackets
           */
-         if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+         if (pc->Is(CT_ANGLE_CLOSE))
          {
-            pc = chunk_skip_to_match_rev(pc, E_Scope::PREPROC);
+            pc = pc->GetOpeningParen(E_Scope::PREPROC);
          }
          Chunk *prev = pc->GetPrevNcNnlNi();
 
@@ -883,12 +875,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();
-   pcf_flags_t 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();
+   T_PcfFlags flags              = PCF_VAR_1ST_DEF;
+   auto       *inheritance_start = get_inheritance_start();
+   Chunk      *pc                = body_end ? body_end : m_start;
 
    /**
     * first, try a simple approach to identify any associated type
@@ -928,7 +920,7 @@ void EnumStructUnionParser::analyze_identifiers()
    }
 
    if (  type_identified()
-      || chunk_is_class_enum_struct_union(pc)
+      || pc->IsClassEnumStructOrUnion()
       || pc == m_end)
    {
       /**
@@ -970,7 +962,7 @@ void EnumStructUnionParser::analyze_identifiers()
 
    while (chunk_is_between(pc, m_start, m_end, false))
    {
-      auto match       = match_variable(pc, m_start->level);
+      auto match       = match_variable(pc, m_start->GetLevel());
       auto *start      = std::get<0>(match);
       auto *identifier = std::get<1>(match);
       auto *end        = std::get<2>(match);
@@ -998,7 +990,7 @@ void EnumStructUnionParser::analyze_identifiers()
       /**
        * skip any right-hand side assignments
        */
-      if (chunk_is_token(pc, CT_ASSIGN))
+      if (pc->Is(CT_ASSIGN))
       {
          pc = skip_to_expression_end(pc);
       }
@@ -1006,9 +998,9 @@ void EnumStructUnionParser::analyze_identifiers()
       /**
        * if we're sitting at a comma or semicolon, skip it
        */
-      if (  chunk_is_semicolon(pc)
-         || (  chunk_is_token(pc, CT_COMMA)
-            && !pc->flags.test_any(PCF_IN_FCN_DEF | PCF_IN_FCN_CALL | PCF_IN_TEMPLATE)
+      if (  pc->IsSemicolon()
+         || (  pc->Is(CT_COMMA)
+            && !pc->GetFlags().test_any(PCF_IN_FCN_DEF | PCF_IN_FCN_CALL | PCF_IN_TEMPLATE)
             && !chunk_is_between(pc, inheritance_start, body_start)))
       {
          pc = pc->GetNextNcNnl();
@@ -1025,8 +1017,8 @@ void EnumStructUnionParser::analyze_identifiers()
     */
    try_post_identify_macro_calls();
 
-   if (  chunk_is_class_or_struct(m_start)
-      && (  chunk_is_not_token(m_start, CT_STRUCT)
+   if (  m_start->IsClassOrStruct()
+      && (  m_start->IsNot(CT_STRUCT)
          || !language_is_set(LANG_C)))
    {
       /**
@@ -1044,7 +1036,7 @@ void EnumStructUnionParser::analyze_identifiers()
           * PCF_VAR_1ST was cleared and a type was identified; therefore, set
           * PCF_VAR_TYPE for the identified type
           */
-         chunk_flags_set(m_type, PCF_VAR_TYPE);
+         m_type->SetFlagBits(PCF_VAR_TYPE);
       }
       else if (~flags & PCF_VAR_INLINE)
       {
@@ -1156,7 +1148,7 @@ Chunk *EnumStructUnionParser::get_inheritance_end() const
 
       if (brace_open == nullptr)
       {
-         brace_open = inheritance_start->GetNextType(CT_BRACE_OPEN, m_start->level, E_Scope::ALL);
+         brace_open = inheritance_start->GetNextType(CT_BRACE_OPEN, m_start->GetLevel(), E_Scope::ALL);
       }
    }
    return(brace_open);
@@ -1246,7 +1238,7 @@ Chunk *EnumStructUnionParser::get_where_end() const
 
       if (brace_open == nullptr)
       {
-         brace_open = where_start->GetNextType(CT_BRACE_OPEN, m_start->level, E_Scope::ALL);
+         brace_open = where_start->GetNextType(CT_BRACE_OPEN, m_start->GetLevel(), E_Scope::ALL);
       }
    }
    return(brace_open);
@@ -1285,23 +1277,34 @@ void EnumStructUnionParser::initialize(Chunk *pc)
    m_start = pc;
    m_type  = nullptr;
    pc      = try_find_end_chunk(pc);
-   m_end   = refine_end_chunk(pc);
+
+   if (parse_error_detected())
+   {
+      return;
+   }
+   m_end = refine_end_chunk(pc);
 } // EnumStructUnionParser::initialize
 
 
 bool EnumStructUnionParser::is_potential_end_chunk(Chunk *pc) const
 {
    LOG_FUNC_ENTRY();
+   LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+           __unqualified_func__, __LINE__,
+           pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
 
    /**
     * test for a semicolon or closing brace at the level of the starting chunk
     */
-   if (  pc == nullptr
+   if (  pc->IsNullChunk()
       || parse_error_detected()
-      || (  (  chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_BRACE_CLOSE))
-         && pc->level == m_start->level))
+      || (  (  pc->IsSemicolon()
+            || pc->Is(CT_BRACE_CLOSE))
+         && pc->GetLevel() == m_start->GetLevel()))
    {
+      LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+              __unqualified_func__, __LINE__,
+              pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
       return(true);
    }
    /**
@@ -1311,20 +1314,23 @@ bool EnumStructUnionParser::is_potential_end_chunk(Chunk *pc) const
     * 3) did we cross the closing paren of a function signature?
     */
 
-   auto const pc_in_funcdef    = pc->flags & PCF_IN_FCN_DEF;
-   auto const pc_in_preproc    = pc->flags & PCF_IN_PREPROC;
-   auto const start_in_funcdef = m_start->flags & PCF_IN_FCN_DEF;
-   auto const start_in_preproc = m_start->flags & PCF_IN_PREPROC;
+   auto const pc_in_funcdef    = pc->GetFlags() & PCF_IN_FCN_DEF;
+   auto const pc_in_preproc    = pc->GetFlags() & PCF_IN_PREPROC;
+   auto const start_in_funcdef = m_start->GetFlags() & PCF_IN_FCN_DEF;
+   auto const start_in_preproc = m_start->GetFlags() & PCF_IN_PREPROC;
 
    /**
     * the following may identify cases where we've reached the
     * end of a cast terminated by a closing paren
     */
-   if (  (  chunk_is_paren_close(pc) // Issue #3538
-         && pc->level < m_start->level)
+   if (  (  pc->IsParenClose() // Issue #3538
+         && pc->GetLevel() < m_start->GetLevel())
       || (start_in_funcdef ^ pc_in_funcdef).test_any()
       || (start_in_preproc ^ pc_in_preproc).test_any())
    {
+      LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+              __unqualified_func__, __LINE__,
+              pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
       return(true);
    }
    /**
@@ -1337,6 +1343,9 @@ bool EnumStructUnionParser::is_potential_end_chunk(Chunk *pc) const
 
    if (start_template_nest > pc_template_nest)
    {
+      LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+              __unqualified_func__, __LINE__,
+              pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
       return(true);
    }
    /**
@@ -1345,22 +1354,28 @@ bool EnumStructUnionParser::is_potential_end_chunk(Chunk *pc) const
     * 2) chunk is an assignment ('=') or comma at the level of the starting chunk
     */
 
-   auto const pc_in_funccall    = pc->flags & PCF_IN_FCN_CALL;
-   auto const start_in_funccall = m_start->flags & PCF_IN_FCN_CALL;
+   auto const pc_in_funccall    = pc->GetFlags() & PCF_IN_FCN_CALL;
+   auto const start_in_funccall = m_start->GetFlags() & PCF_IN_FCN_CALL;
 
    if (  (  pc_in_funccall.test_any()
          && start_in_funccall.test_any()
-         && chunk_is_token(pc, CT_COMMA)
-         && pc->level == m_start->level)
+         && pc->Is(CT_COMMA)
+         && pc->GetLevel() == m_start->GetLevel())
       || (  pc_in_funcdef.test_any()
-         && (  (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-               && pc->level < m_start->level)
-            || (  (  chunk_is_token(pc, CT_ASSIGN)
-                  || chunk_is_token(pc, CT_COMMA))
-               && pc->level == m_start->level))))
-   {
+         && (  (  pc->Is(CT_FPAREN_CLOSE)
+               && pc->GetLevel() < m_start->GetLevel())
+            || (  (  pc->Is(CT_ASSIGN)
+                  || pc->Is(CT_COMMA))
+               && pc->GetLevel() == m_start->GetLevel()))))
+   {
+      LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+              __unqualified_func__, __LINE__,
+              pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
       return(true);
    }
+   LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+           __unqualified_func__, __LINE__,
+           pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
    return(false);
 } // EnumStructUnionParser::is_potential_end_chunk
 
@@ -1397,7 +1412,7 @@ bool EnumStructUnionParser::is_within_inheritance_list(Chunk *pc) const
    LOG_FUNC_ENTRY();
 
    if (  pc != nullptr
-      && pc->flags.test(PCF_IN_CLASS_BASE))
+      && pc->TestFlags(PCF_IN_CLASS_BASE))
    {
       return(true);
    }
@@ -1418,7 +1433,7 @@ bool EnumStructUnionParser::is_within_where_clause(Chunk *pc) const
    LOG_FUNC_ENTRY();
 
    if (  pc != nullptr
-      && pc->flags.test(PCF_IN_WHERE_SPEC))
+      && pc->TestFlags(PCF_IN_WHERE_SPEC))
    {
       return(true);
    }
@@ -1438,28 +1453,29 @@ void EnumStructUnionParser::mark_base_classes(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   pcf_flags_t flags = PCF_VAR_1ST_DEF;
+   T_PcfFlags flags = PCF_VAR_1ST_DEF;
 
-   while (pc != nullptr)
+   while (  pc != nullptr
+         && pc->IsNotNullChunk())
    {
-      chunk_flags_set(pc, PCF_IN_CLASS_BASE);
+      pc->SetFlagBits(PCF_IN_CLASS_BASE);
       /**
        * clear the PCF_VAR_TYPE flag for all chunks within the inheritance list
        * TODO: this may not be necessary in the future once code outside this
        *       class is improved such that PCF_VAR_TYPE is not set for these chunks
        */
-      pc->flags &= ~PCF_VAR_TYPE;
+      pc->ResetFlagBits(PCF_VAR_TYPE);
 
       Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-      if (chunk_is_token(next, CT_DC_MEMBER))
+      if (next->Is(CT_DC_MEMBER))
       {
          /**
           * just in case it's a templated type
           */
          pc = skip_template_prev(pc);
 
-         if (chunk_is_token(pc, CT_WORD))
+         if (pc->Is(CT_WORD))
          {
             /**
              * TODO:
@@ -1470,22 +1486,22 @@ void EnumStructUnionParser::mark_base_classes(Chunk *pc)
              * in the absence of a pair trailing angle brackets, the chunk may be
              * a namespace rather than a type. Need to revisit this!
              */
-            set_chunk_type(pc, CT_TYPE);
+            pc->SetType(CT_TYPE);
          }
       }
-      else if (  (  chunk_is_token(next, CT_BRACE_OPEN)
-                 || (  chunk_is_token(next, CT_COMMA)
+      else if (  (  next->Is(CT_BRACE_OPEN)
+                 || (  next->Is(CT_COMMA)
                     && !is_within_where_clause(next)))
-              && next->level == m_start->level)
+              && next->GetLevel() == m_start->GetLevel())
       {
          /**
           * just in case it's a templated type
           */
          pc = skip_template_prev(pc);
 
-         if (chunk_is_token(pc, CT_WORD))
+         if (pc->Is(CT_WORD))
          {
-            chunk_flags_set(pc, flags);
+            pc->SetFlagBits(flags);
 
             if (flags & PCF_VAR_1ST)
             {
@@ -1493,14 +1509,14 @@ void EnumStructUnionParser::mark_base_classes(Chunk *pc)
             }
          }
 
-         if (chunk_is_token(next, CT_BRACE_OPEN))
+         if (next->Is(CT_BRACE_OPEN))
          {
             break;
          }
       }
       pc = next;
    }
-   chunk_flags_set(pc, PCF_IN_CLASS_BASE);
+   pc->SetFlagBits(PCF_IN_CLASS_BASE);
 } // EnumStructUnionParser::mark_base_classes
 
 
@@ -1508,17 +1524,17 @@ void EnumStructUnionParser::mark_braces(Chunk *brace_open)
 {
    LOG_FUNC_ENTRY();
 
-   pcf_flags_t flags = PCF_NONE;
+   T_PcfFlags flags = PCF_NONE;
 
-   if (chunk_is_token(m_start, CT_CLASS))
+   if (m_start->Is(CT_CLASS))
    {
       flags = PCF_IN_CLASS;
    }
-   else if (chunk_is_enum(m_start))
+   else if (m_start->IsEnum())
    {
       flags = PCF_IN_ENUM;
    }
-   else if (chunk_is_token(m_start, CT_STRUCT))
+   else if (m_start->Is(CT_STRUCT))
    {
       flags = PCF_IN_STRUCT;
    }
@@ -1533,7 +1549,7 @@ void EnumStructUnionParser::mark_braces(Chunk *brace_open)
                CT_NONE,
                false);
 
-   if (chunk_is_class_struct_union(m_start))
+   if (m_start->IsClassStructOrUnion())
    {
       mark_struct_union_body(brace_open);
 
@@ -1550,13 +1566,13 @@ void EnumStructUnionParser::mark_braces(Chunk *brace_open)
          mark_base_classes(inheritance_start);
       }
    }
-   set_chunk_parent(brace_open, m_start->type);
+   brace_open->SetParentType(m_start->GetType());
 
-   auto *brace_close = chunk_skip_to_match(brace_open, E_Scope::PREPROC);
+   auto *brace_close = brace_open->GetClosingParen(E_Scope::PREPROC);
 
-   if (brace_close != nullptr)
+   if (brace_close->IsNotNullChunk())
    {
-      set_chunk_parent(brace_close, m_start->type);
+      brace_close->SetParentType(m_start->GetType());
    }
 } // EnumStructUnionParser::mark_braces
 
@@ -1566,20 +1582,20 @@ void EnumStructUnionParser::mark_class_colon(Chunk *colon)
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LFTOR,
-           "%s(%d): Class colon detected: orig_line is %zu, orig_col is %zu\n",
+           "%s(%d): Class colon detected: orig line is %zu, orig col is %zu\n",
            __unqualified_func__,
            __LINE__,
-           colon->orig_line,
-           colon->orig_col);
+           colon->GetOrigLine(),
+           colon->GetOrigCol());
 
-   set_chunk_type(colon, CT_CLASS_COLON);
-   set_chunk_parent(colon, m_start->type);
+   colon->SetType(CT_CLASS_COLON);
+   colon->SetParentType(m_start->GetType());
 } // EnumStructUnionParser::mark_class_colon
 
 
 void EnumStructUnionParser::mark_conditional_colon(Chunk *colon)
 {
-   set_chunk_type(colon, CT_COND_COLON);
+   colon->SetType(CT_COND_COLON);
 } // EnumStructUnionParser::mark_conditional_colon
 
 
@@ -1593,18 +1609,18 @@ void EnumStructUnionParser::mark_constructors()
     */
    if (  body_detected()
       && type_identified()
-      && chunk_is_class_or_struct(m_start))
+      && m_start->IsClassOrStruct())
    {
       LOG_FMT(LFTOR,
-              "%s(%d): orig_line is %zu, orig_col is %zu, start is '%s', parent_type is %s\n",
+              "%s(%d): orig line is %zu, orig col is %zu, start is '%s', parent type is %s\n",
               __unqualified_func__,
               __LINE__,
-              m_start->orig_line,
-              m_start->orig_col,
+              m_start->GetOrigLine(),
+              m_start->GetOrigCol(),
               m_start->Text(),
-              get_token_name(get_chunk_parent_type(m_start)));
+              get_token_name(m_start->GetParentType()));
 
-      log_pcf_flags(LFTOR, m_start->flags);
+      log_pcf_flags(LFTOR, m_start->GetFlags());
 
       /**
        * get the name of the type
@@ -1618,14 +1634,14 @@ void EnumStructUnionParser::mark_constructors()
               __unqualified_func__,
               __LINE__,
               name);
-      log_pcf_flags(LFTOR, m_type->flags);
+      log_pcf_flags(LFTOR, m_type->GetFlags());
 
       Chunk       *next = Chunk::NullChunkPtr;
-      std::size_t level = m_type->brace_level + 1;
+      std::size_t level = m_type->GetBraceLevel() + 1;
 
       for (auto *prev = body_start; next != body_end; prev = next)
       {
-         chunk_flags_set(prev, PCF_IN_CLASS);
+         prev->SetFlagBits(PCF_IN_CLASS);
 
          next = skip_template_next(prev->GetNextNcNnl(E_Scope::PREPROC));                         // Issue #3368
 
@@ -1634,25 +1650,25 @@ void EnumStructUnionParser::mark_constructors()
           */
          if (  prev->IsNotNullChunk()
             && std::strcmp(prev->Text(), name) == 0
-            && prev->level == level
-            && chunk_is_paren_open(next))
+            && prev->GetLevel() == level
+            && next->IsParenOpen())
          {
-            set_chunk_type(prev, CT_FUNC_CLASS_DEF);
+            prev->SetType(CT_FUNC_CLASS_DEF);
 
             LOG_FMT(LFTOR,
-                    "%s(%d): Constructor/destructor detected: '%s' at orig_line is %zu, orig_col is %zu, type is %s\n",
+                    "%s(%d): Constructor/destructor detected: '%s' at orig line is %zu, orig col is %zu, type is %s\n",
                     __unqualified_func__,
                     __LINE__,
                     name,
-                    prev->orig_line,
-                    prev->orig_col,
-                    get_token_name(prev->type));
+                    prev->GetOrigLine(),
+                    prev->GetOrigCol(),
+                    get_token_name(prev->GetType()));
 
             mark_cpp_constructor(prev);
          }
       }
 
-      chunk_flags_set(next, PCF_IN_CLASS);
+      next->SetFlagBits(PCF_IN_CLASS);
    }
 } // EnumStructUnionParser::mark_constructor
 
@@ -1661,8 +1677,8 @@ void EnumStructUnionParser::mark_enum_integral_type(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
-   set_chunk_type(colon, CT_BIT_COLON);
-   set_chunk_parent(colon, m_start->type);
+   colon->SetType(CT_BIT_COLON);
+   colon->SetParentType(m_start->GetType());
 
    auto *body_start = get_body_start();
    auto *pc         = colon->GetNextNcNnl();
@@ -1675,19 +1691,19 @@ void EnumStructUnionParser::mark_enum_integral_type(Chunk *colon)
 
    while (  chunk_is_between(pc, m_start, m_end)
          && pc != body_start
-         && chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && !chunk_is_semicolon(pc))
+         && pc->IsNot(CT_BRACE_OPEN)
+         && !pc->IsSemicolon())
    {
       /**
        * clear the PCF_VAR_TYPE flag for all chunks within the enum integral base
        * TODO: this may not be necessary in the future once code outside this
        *       class is improved such that PCF_VAR_TYPE is not set for these chunks
        */
-      if (chunk_is_not_token(pc, CT_DC_MEMBER))                             // Issue #3198
+      if (pc->IsNot(CT_DC_MEMBER))                             // Issue #3198
       {
-         pc->flags &= ~PCF_VAR_TYPE;
-         set_chunk_type(pc, CT_TYPE);
-         set_chunk_parent(pc, colon->type);
+         pc->ResetFlagBits(PCF_VAR_TYPE);
+         pc->SetType(CT_TYPE);
+         pc->SetParentType(colon->GetType());
       }
       pc = pc->GetNextNcNnl();
    }
@@ -1710,15 +1726,15 @@ void EnumStructUnionParser::mark_extracorporeal_lvalues()
     * erroneously marked chunks - as previously mentioned, this likely
     * won't be necessary with improvements to the mark_lvalue() function
     */
-   if (get_chunk_parent_type(next) == CT_TEMPLATE)
+   if (next->GetParentType() == CT_TEMPLATE)
    {
       while (true)
       {
          prev = next->GetPrevNcNnlNi();
 
          if (  prev->IsNullChunk()
-            || (  !prev->flags.test(PCF_IN_TEMPLATE)
-               && chunk_is_not_token(prev, CT_TEMPLATE)))
+            || (  !prev->TestFlags(PCF_IN_TEMPLATE)
+               && prev->IsNot(CT_TEMPLATE)))
          {
             break;
          }
@@ -1731,16 +1747,16 @@ void EnumStructUnionParser::mark_extracorporeal_lvalues()
    while (next != m_end)
    {
       if (  !chunk_is_between(next, body_start, body_end)
-         && next->flags.test(PCF_LVALUE))
+         && next->TestFlags(PCF_LVALUE))
       {
-         next->flags &= ~PCF_LVALUE;
+         next->ResetFlagBits(PCF_LVALUE);
       }
-      else if (  (  chunk_is_token(next, CT_ASSIGN)
-                 || chunk_is_token(next, CT_BRACE_OPEN))
-              && chunk_is_token(prev, CT_WORD)
-              && prev->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
+      else if (  (  next->Is(CT_ASSIGN)
+                 || next->Is(CT_BRACE_OPEN))
+              && prev->Is(CT_WORD)
+              && prev->GetFlags().test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
       {
-         chunk_flags_set(prev, PCF_LVALUE);
+         prev->SetFlagBits(PCF_LVALUE);
       }
       prev = next;
       next = next->GetNextNcNnl();
@@ -1758,7 +1774,7 @@ void EnumStructUnionParser::mark_nested_name_specifiers(Chunk *pc)
 
    for (pc = start; chunk_is_between(pc, start, end); pc = pc->GetNextNcNnl())
    {
-      if (chunk_is_token(pc, CT_WORD))
+      if (pc->Is(CT_WORD))
       {
          /**
           * if the next token is an opening angle, then we can safely
@@ -1766,38 +1782,38 @@ void EnumStructUnionParser::mark_nested_name_specifiers(Chunk *pc)
           */
          auto *next = pc->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_ANGLE_OPEN))
+         if (next->Is(CT_ANGLE_OPEN))
          {
             /**
              * the template may have already been previously marked elsewhere...
              */
             auto *angle_open  = next;
-            auto *angle_close = chunk_skip_to_match(angle_open, E_Scope::PREPROC);
+            auto *angle_close = angle_open->GetClosingParen(E_Scope::PREPROC);
 
-            if (angle_close == nullptr)
+            if (angle_close->IsNullChunk())
             {
                // parse error
                parse_error_detected(true);
 
                // TODO: should this be just a warning or an error (with exit condition?)
                LOG_FMT(LWARN,
-                       "%s(%d): Unmatched '<' at orig_line is %zu, orig_col is %zu\n",
+                       "%s(%d): Unmatched '<' at orig line is %zu, orig col is %zu\n",
                        __unqualified_func__,
                        __LINE__,
-                       angle_open->orig_line,
-                       angle_open->orig_col);
+                       angle_open->GetOrigLine(),
+                       angle_open->GetOrigCol());
 
                break;
             }
-            set_chunk_type(pc, CT_TYPE);
+            pc->SetType(CT_TYPE);
             mark_template(next);
             pc = angle_close;
          }
          else if (  is_within_inheritance_list(pc)
-                 && (  chunk_is_token(next, CT_COMMA)
-                    || chunk_is_token(next, CT_BRACE_OPEN)))
+                 && (  next->Is(CT_COMMA)
+                    || next->Is(CT_BRACE_OPEN)))
          {
-            set_chunk_type(pc, CT_TYPE);
+            pc->SetType(CT_TYPE);
          }
       }
    }
@@ -1808,19 +1824,19 @@ void EnumStructUnionParser::mark_pointer_types(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(pc, CT_WORD))
+   if (pc->Is(CT_WORD))
    {
       do
       {
          // TODO: should there be a CT_BYREF_TYPE?
          pc = pc->GetPrevNcNnlNi();
 
-         if (chunk_is_ptr_operator(pc))
+         if (pc->IsPointerOperator())
          {
-            set_chunk_parent(pc, m_start->type);
-            set_chunk_type(pc, CT_PTR_TYPE);
+            pc->SetParentType(m_start->GetType());
+            pc->SetType(CT_PTR_TYPE);
          }
-      } while (chunk_is_pointer_reference_or_qualifier(pc));
+      } while (pc->IsPointerReferenceOrQualifier());
    }
 } // EnumStructUnionParser::mark_pointer_types
 
@@ -1832,20 +1848,20 @@ void EnumStructUnionParser::mark_template(Chunk *start) const
    if (start != nullptr)
    {
       LOG_FMT(LTEMPL,
-              "%s(%d): Template detected: '%s' at orig_line %zu, orig_col %zu\n",
+              "%s(%d): Template detected: '%s' at orig line %zu, orig col %zu\n",
               __unqualified_func__,
               __LINE__,
               start->Text(),
-              start->orig_line,
-              start->orig_col);
+              start->GetOrigLine(),
+              start->GetOrigCol());
    }
-   set_chunk_parent(start, CT_TEMPLATE);
+   start->SetParentType(CT_TEMPLATE);
 
-   auto *end = chunk_skip_to_match(start, E_Scope::PREPROC);
+   auto *end = start->GetClosingParen(E_Scope::PREPROC);
 
-   if (end != nullptr)
+   if (end->IsNotNullChunk())
    {
-      set_chunk_parent(end, CT_TEMPLATE);
+      end->SetParentType(CT_TEMPLATE);
 
       mark_template_args(start, end);
    }
@@ -1860,15 +1876,15 @@ void EnumStructUnionParser::mark_template_args(Chunk *start, Chunk *end) const
       && start != nullptr)
    {
       LOG_FMT(LTEMPL,
-              "%s(%d): Start of template detected: '%s' at orig_line %zu, orig_col %zu\n",
+              "%s(%d): Start of template detected: '%s' at orig line %zu, orig col %zu\n",
               __unqualified_func__,
               __LINE__,
               start->Text(),
-              start->orig_line,
-              start->orig_col);
+              start->GetOrigLine(),
+              start->GetOrigCol());
 
-      pcf_flags_t flags = PCF_IN_TEMPLATE;
-      Chunk       *next = start;
+      T_PcfFlags flags = PCF_IN_TEMPLATE;
+      Chunk      *next = start;
 
       /**
        * TODO: for now, just mark the chunks within the template as PCF_IN_TEMPLATE;
@@ -1884,15 +1900,15 @@ void EnumStructUnionParser::mark_template_args(Chunk *start, Chunk *end) const
          {
             break;
          }
-         chunk_flags_set(next, flags);
+         next->SetFlagBits(flags);
       }
       LOG_FMT(LTEMPL,
-              "%s(%d): End of template detected: '%s' at orig_line %zu, orig_col %zu\n",
+              "%s(%d): End of template detected: '%s' at orig line %zu, orig col %zu\n",
               __unqualified_func__,
               __LINE__,
               end->Text(),
-              end->orig_line,
-              end->orig_col);
+              end->GetOrigLine(),
+              end->GetOrigCol());
    }
 } // EnumStructUnionParser::mark_template_args
 
@@ -1908,30 +1924,30 @@ void EnumStructUnionParser::mark_type(Chunk *pc)
       do
       {
          make_type(pc);
-         set_chunk_parent(pc, m_start->type);
+         pc->SetParentType(m_start->GetType());
          pc = pc->GetNextNcNnl(E_Scope::PREPROC);
-      } while (chunk_is_pointer_or_reference(pc));
+      } while (pc->IsPointerOrReference());
    }
 } // EnumStructUnionParser::mark_type
 
 
-void EnumStructUnionParser::mark_variable(Chunk *variable, pcf_flags_t flags)
+void EnumStructUnionParser::mark_variable(Chunk *variable, T_PcfFlags flags)
 {
    LOG_FUNC_ENTRY();
 
    if (variable != nullptr)
    {
       LOG_FMT(LVARDEF,
-              "%s(%d): Variable definition detected: '%s' at orig_line is %zu, orig_col is %zu, set %s\n",
+              "%s(%d): Variable definition detected: '%s' at orig line is %zu, orig col is %zu, set %s\n",
               __unqualified_func__,
               __LINE__,
               variable->Text(),
-              variable->orig_line,
-              variable->orig_col,
+              variable->GetOrigLine(),
+              variable->GetOrigCol(),
               flags & PCF_VAR_1ST_DEF ? "PCF_VAR_1ST_DEF" : "PCF_VAR_1ST");
 
-      chunk_flags_set(variable, flags);
-      set_chunk_type(variable, CT_WORD);
+      variable->SetFlagBits(flags);
+      variable->SetType(CT_WORD);
       mark_pointer_types(variable);
    }
 } // EnumStructUnionParser::mark_variable
@@ -1944,11 +1960,11 @@ void EnumStructUnionParser::mark_where_clause(Chunk *where)
    if (where != nullptr)
    {
       LOG_FMT(LFTOR,
-              "%s(%d): Where clause detected: orig_line is %zu, orig_col is %zu\n",
+              "%s(%d): Where clause detected: orig line is %zu, orig col is %zu\n",
               __unqualified_func__,
               __LINE__,
-              where->orig_line,
-              where->orig_col);
+              where->GetOrigLine(),
+              where->GetOrigCol());
    }
    set_where_start(where);
 
@@ -1957,11 +1973,11 @@ void EnumStructUnionParser::mark_where_clause(Chunk *where)
 
    set_where_end(where_end);
 
-   pcf_flags_t flags;
+   T_PcfFlags flags;
 
    for (auto *pc = where_start; pc != where_end; pc = pc->GetNextNcNnl())
    {
-      flags = mark_where_chunk(pc, m_start->type, flags);
+      flags = mark_where_chunk(pc, m_start->GetType(), flags);
    }
 } // EnumStructUnionParser::mark_where_clause
 
@@ -1973,14 +1989,14 @@ void EnumStructUnionParser::mark_where_colon(Chunk *colon)
    if (colon != nullptr)
    {
       LOG_FMT(LFTOR,
-              "%s(%d): Where colon detected: orig_line is %zu, orig_col is %zu\n",
+              "%s(%d): Where colon detected: orig line is %zu, orig col is %zu\n",
               __unqualified_func__,
               __LINE__,
-              colon->orig_line,
-              colon->orig_col);
+              colon->GetOrigLine(),
+              colon->GetOrigCol());
    }
-   set_chunk_type(colon, CT_WHERE_COLON);
-   set_chunk_parent(colon, m_start->type);
+   colon->SetType(CT_WHERE_COLON);
+   colon->SetParentType(m_start->GetType());
 } // EnumStructUnionParser::mark_where_colon
 
 
@@ -1990,12 +2006,17 @@ void EnumStructUnionParser::parse(Chunk *pc)
 
    initialize(pc);
 
+   if (parse_error_detected())
+   {
+      return;
+   }
+
    /**
     * make sure this wasn't a cast, and also make sure we're
     * actually dealing with a class/enum/struct/union type
     */
-   if (  get_chunk_parent_type(m_start) == CT_C_CAST
-      || !chunk_is_class_enum_struct_union(m_start))
+   if (  m_start->GetParentType() == CT_C_CAST
+      || !m_start->IsClassEnumStructOrUnion())
    {
       return;
    }
@@ -2005,17 +2026,17 @@ void EnumStructUnionParser::parse(Chunk *pc)
    /**
     * the enum-key might be enum, enum class or enum struct
     */
-   if (chunk_is_enum(next))
+   if (next->IsEnum())
    {
       prev = next;
       next = prev->GetNextNcNnl();
    }
-   else if (chunk_is_enum(prev))
+   else if (prev->IsEnum())
    {
-      auto *prev_prev = prev->GetPrevNcNnlNi();
+      Chunk *prev_prev = prev->GetPrevNcNnlNi();
 
-      if (  chunk_is_enum(prev_prev)
-         && chunk_is_enum(prev))
+      if (  prev_prev->IsEnum()
+         && prev->IsEnum())
       {
          m_start = prev_prev;
       }
@@ -2040,58 +2061,58 @@ void EnumStructUnionParser::parse(Chunk *pc)
       /**
        * skip any right-hand side assignments
        */
-      if (chunk_is_token(next, CT_ASSIGN))
+      if (next->Is(CT_ASSIGN))
       {
          next = skip_to_expression_end(next);
       }
 
-      if (  chunk_is_token(next, CT_ANGLE_OPEN)
+      if (  next->Is(CT_ANGLE_OPEN)
          && !template_detected())
       {
          next = parse_angles(next);
       }
-      else if (  chunk_is_token(next, CT_BRACE_OPEN)
+      else if (  next->Is(CT_BRACE_OPEN)
               && !body_detected())
       {
          next = parse_braces(next);
       }
-      else if (chunk_is_colon(next))
+      else if (next->IsColon())
       {
          parse_colon(next);
       }
-      else if (chunk_is_token(next, CT_COMMA))
+      else if (next->Is(CT_COMMA))
       {
          record_top_level_comma(next);
       }
-      else if (chunk_is_token(next, CT_DC_MEMBER))
+      else if (next->Is(CT_DC_MEMBER))
       {
          next = parse_double_colon(next);
       }
-      else if (  chunk_is_paren_open(next)
+      else if (  next->IsParenOpen()
               && (  language_is_set(LANG_D)
                  || (  language_is_set(LANG_PAWN)
-                    && chunk_is_enum(m_start))))
+                    && m_start->IsEnum())))
       {
-         set_paren_parent(next, m_start->type);
+         set_paren_parent(next, m_start->GetType());
 
-         if (  chunk_is_token(prev, CT_WORD)
+         if (  prev->Is(CT_WORD)
             && language_is_set(LANG_D))
          {
             mark_template(next);
          }
-         next = chunk_skip_to_match(next, E_Scope::PREPROC);
+         next = next->GetClosingParen(E_Scope::PREPROC);
       }
-      else if (  chunk_is_token(next, CT_QUALIFIER)
+      else if (  next->Is(CT_QUALIFIER)
               && language_is_set(LANG_JAVA)
-              && std::strncmp(next->str.c_str(), "implements", 10) == 0)
+              && std::strncmp(next->GetStr().c_str(), "implements", 10) == 0)
       {
          mark_base_classes(next);
       }
-      else if (chunk_is_token(next, CT_QUESTION))
+      else if (next->Is(CT_QUESTION))
       {
          record_question_operator(next);
       }
-      else if (  chunk_is_token(next, CT_WHERE)
+      else if (  next->Is(CT_WHERE)
               && !where_clause_detected())
       {
          mark_where_clause(next);
@@ -2102,7 +2123,7 @@ void EnumStructUnionParser::parse(Chunk *pc)
       {
          next = next->GetNextNcNnl();
       } while (  next->IsNotNullChunk()
-              && next->level > m_start->level);
+              && next->GetLevel() > m_start->GetLevel());
    }
    /**
     * identify the type and/or variable(s)
@@ -2114,12 +2135,12 @@ void EnumStructUnionParser::parse(Chunk *pc)
     */
    mark_extracorporeal_lvalues();
 
-   if (  prev != nullptr
-      && chunk_is_semicolon(prev)
-      && prev->level == m_start->level
-      && !prev->flags.test(PCF_IN_FOR))
+   if (  prev->IsNotNullChunk()
+      && prev->IsSemicolon()
+      && prev->GetLevel() == m_start->GetLevel()
+      && !prev->TestFlags(PCF_IN_FOR))
    {
-      set_chunk_parent(prev, m_start->type);
+      prev->SetParentType(m_start->GetType());
    }
 } // EnumStructUnionParser::parse
 
@@ -2138,20 +2159,20 @@ Chunk *EnumStructUnionParser::parse_angles(Chunk *angle_open)
       /**
        * check to see if there's a matching closing angle bracket
        */
-      auto *angle_close = chunk_skip_to_match(angle_open, E_Scope::PREPROC);
+      auto *angle_close = angle_open->GetClosingParen(E_Scope::PREPROC);
 
-      if (angle_close == nullptr)
+      if (angle_close->IsNullChunk())
       {
          // parse error
          parse_error_detected(true);
 
          // TODO: should this be just a warning or an error (with exit condition?)
          LOG_FMT(LWARN,
-                 "%s(%d): Unmatched '<' at orig_line is %zu, orig_col is %zu\n",
+                 "%s(%d): Unmatched '<' at orig line is %zu, orig col is %zu\n",
                  __unqualified_func__,
                  __LINE__,
-                 angle_open->orig_line,
-                 angle_open->orig_col);
+                 angle_open->GetOrigLine(),
+                 angle_open->GetOrigCol());
       }
       else
       {
@@ -2161,7 +2182,7 @@ Chunk *EnumStructUnionParser::parse_angles(Chunk *angle_open)
           */
          auto *next = angle_close->GetNextNcNnl();
 
-         if (chunk_is_not_token(next, CT_DC_MEMBER))
+         if (next->IsNot(CT_DC_MEMBER))
          {
             set_template_start(angle_open);
 
@@ -2172,18 +2193,18 @@ Chunk *EnumStructUnionParser::parse_angles(Chunk *angle_open)
              */
             auto *prev = angle_open->GetPrevNcNnlNi();
 
-            if (chunk_is_not_token(prev, CT_WORD))
+            if (prev->IsNot(CT_WORD))
             {
                // parse error
                parse_error_detected(true);
 
                // TODO: should this be just a warning or an error (with exit condition?)
                LOG_FMT(LWARN,
-                       "%s(%d): Identifier missing before '<' at orig_line is %zu, orig_col is %zu\n",
+                       "%s(%d): Identifier missing before '<' at orig line is %zu, orig col is %zu\n",
                        __unqualified_func__,
                        __LINE__,
-                       angle_open->orig_line,
-                       angle_open->orig_col);
+                       angle_open->GetOrigLine(),
+                       angle_open->GetOrigCol());
             }
             else
             {
@@ -2210,9 +2231,9 @@ Chunk *EnumStructUnionParser::parse_braces(Chunk *brace_open)
     */
 
    auto *pc          = brace_open;
-   auto *brace_close = chunk_skip_to_match(pc, E_Scope::PREPROC);
+   auto *brace_close = pc->GetClosingParen(E_Scope::PREPROC);
 
-   if (brace_close != nullptr)
+   if (brace_close->IsNotNullChunk())
    {
       /**
        * we could be dealing with a variable definition preceded by
@@ -2249,7 +2270,7 @@ Chunk *EnumStructUnionParser::parse_braces(Chunk *brace_open)
 
       if (  (  language_is_set(LANG_C)
             || language_is_set(LANG_CPP))
-         && chunk_is_paren_close(prev))
+         && prev->IsParenClose())
       {
          /**
           * we may be dealing with a c/cpp function definition, where the 'struct'
@@ -2259,9 +2280,9 @@ Chunk *EnumStructUnionParser::parse_braces(Chunk *brace_open)
          auto *paren_close = prev;
 
          // skip in reverse to the matching open paren
-         auto *paren_open = chunk_skip_to_match_rev(paren_close);
+         auto *paren_open = paren_close->GetOpeningParen();
 
-         if (paren_open != nullptr)
+         if (paren_open->IsNotNullChunk())
          {
             /**
              * determine if there's an identifier preceding the open paren;
@@ -2270,16 +2291,16 @@ Chunk *EnumStructUnionParser::parse_braces(Chunk *brace_open)
              */
             auto *type       = m_start->GetNextNcNnl();
             auto *identifier = paren_open->GetPrevNcNnlNi(E_Scope::PREPROC);
-            is_potential_function_definition = (  (  chunk_is_token(identifier, CT_FUNCTION)
-                                                  || chunk_is_token(identifier, CT_FUNC_DEF)
-                                                  || chunk_is_token(identifier, CT_WORD))
+            is_potential_function_definition = (  (  identifier->Is(CT_FUNCTION)
+                                                  || identifier->Is(CT_FUNC_DEF)
+                                                  || identifier->Is(CT_WORD))
                                                && type != identifier);
          }
       }
 
       if (  language_is_set(LANG_D)
          || language_is_set(LANG_PAWN)
-         || !chunk_is_paren_close(prev)
+         || !prev->IsParenClose()
          || is_potential_function_definition
          || chunk_is_between(prev, enum_base_start, brace_open)
          || chunk_is_between(prev, inheritance_start, brace_open))
@@ -2291,7 +2312,7 @@ Chunk *EnumStructUnionParser::parse_braces(Chunk *brace_open)
           * other code happy.
           */
          if (  language_is_set(LANG_D)
-            && chunk_is_enum(m_start))
+            && m_start->IsEnum())
          {
             pawn_add_vsemi_after(brace_close); // Issue #2279
          }
@@ -2301,11 +2322,11 @@ Chunk *EnumStructUnionParser::parse_braces(Chunk *brace_open)
       {
          // TODO: should this be just a warning or an error (with exit condition?)
          LOG_FMT(LWARN,
-                 "%s(%d): Parsing error precedes start of body '{' at orig_line is %zu, orig_col is %zu\n",
+                 "%s(%d): Parsing error precedes start of body '{' at orig line is %zu, orig col is %zu\n",
                  __unqualified_func__,
                  __LINE__,
-                 brace_open->orig_line,
-                 brace_open->orig_col);
+                 brace_open->GetOrigLine(),
+                 brace_open->GetOrigCol());
 
          // parse error
          parse_error_detected(true);
@@ -2319,7 +2340,7 @@ void EnumStructUnionParser::parse_colon(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(m_start, CT_UNION))
+   if (m_start->Is(CT_UNION))
    {
       /**
        * unions do not implement inheritance
@@ -2327,11 +2348,11 @@ void EnumStructUnionParser::parse_colon(Chunk *colon)
 
       // TODO: should this be just a warning or an error (with exit condition?)
       LOG_FMT(LWARN,
-              "%s(%d): Colon follows union declaration at orig_line is %zu, orig_col is %zu\n",
+              "%s(%d): Colon follows union declaration at orig line is %zu, orig col is %zu\n",
               __unqualified_func__,
               __LINE__,
-              colon->orig_line,
-              colon->orig_col);
+              colon->GetOrigLine(),
+              colon->GetOrigCol());
 
       // parse error
       parse_error_detected(true);
@@ -2346,7 +2367,7 @@ void EnumStructUnionParser::parse_colon(Chunk *colon)
    }
    else if (!inheritance_detected())
    {
-      if (chunk_is_class_or_struct(m_start))
+      if (m_start->IsClassOrStruct())
       {
          /**
           * the colon likely specifies an inheritance list for a struct
@@ -2356,7 +2377,7 @@ void EnumStructUnionParser::parse_colon(Chunk *colon)
          set_inheritance_start(colon);
          mark_class_colon(colon);
       }
-      else if (chunk_is_enum(m_start))
+      else if (m_start->IsEnum())
       {
          set_enum_base_start(colon);
          mark_enum_integral_type(colon);
@@ -2372,7 +2393,7 @@ Chunk *EnumStructUnionParser::parse_double_colon(Chunk *double_colon)
    auto *pc = double_colon;
 
    if (  language_is_set(LANG_CPP)
-      && chunk_is_token(pc, CT_DC_MEMBER))
+      && pc->Is(CT_DC_MEMBER))
    {
       mark_nested_name_specifiers(pc);
       pc = skip_scope_resolution_and_nested_name_specifiers(pc);
@@ -2401,7 +2422,7 @@ void EnumStructUnionParser::record_question_operator(Chunk *question)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(question, CT_QUESTION))
+   if (question->Is(CT_QUESTION))
    {
       std::size_t index = m_chunk_map[CT_QUESTION].size();
 
@@ -2413,7 +2434,7 @@ void EnumStructUnionParser::record_question_operator(Chunk *question)
 void EnumStructUnionParser::record_top_level_comma(Chunk *comma)
 {
    if (  comma != nullptr
-      && comma->level == m_start->level
+      && comma->GetLevel() == m_start->GetLevel()
       && !is_within_conditional(comma)
       && !is_within_inheritance_list(comma))
    {
@@ -2430,7 +2451,7 @@ Chunk *EnumStructUnionParser::refine_end_chunk(Chunk *pc)
 
    if (  (  language_is_set(LANG_C)
          || language_is_set(LANG_CPP))
-      && chunk_is_token(pc, CT_BRACE_CLOSE))
+      && pc->Is(CT_BRACE_CLOSE))
    {
       /**
        * if dealing with C/C++, one or more trailing variable definitions may
@@ -2446,7 +2467,7 @@ Chunk *EnumStructUnionParser::refine_end_chunk(Chunk *pc)
 
       while (true)
       {
-         if (chunk_is_semicolon(next))
+         if (next->IsSemicolon())
          {
             pc = next;
 
@@ -2457,11 +2478,11 @@ Chunk *EnumStructUnionParser::refine_end_chunk(Chunk *pc)
             /**
              * if we're sitting at a comma, skip it
              */
-            if (chunk_is_token(next, CT_COMMA))
+            if (next->Is(CT_COMMA))
             {
                next = next->GetNextNcNnl();
             }
-            auto match       = match_variable(next, m_start->level);
+            auto match       = match_variable(next, m_start->GetLevel());
             auto *start      = std::get<0>(match);
             auto *identifier = std::get<1>(match);
             auto *end        = std::get<2>(match);
@@ -2479,7 +2500,7 @@ Chunk *EnumStructUnionParser::refine_end_chunk(Chunk *pc)
                /**
                 * skip any right-hand side assignments
                 */
-               if (chunk_is_token(pc, CT_ASSIGN))
+               if (pc->Is(CT_ASSIGN))
                {
                   pc = skip_to_expression_end(pc);
                }
@@ -2496,7 +2517,7 @@ void EnumStructUnionParser::set_body_end(Chunk *body_end)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(body_end, CT_BRACE_CLOSE))
+   if (body_end->Is(CT_BRACE_CLOSE))
    {
       m_chunk_map[CT_BRACE_CLOSE][0] = body_end;
    }
@@ -2507,7 +2528,7 @@ void EnumStructUnionParser::set_body_start(Chunk *body_start)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(body_start, CT_BRACE_OPEN))
+   if (body_start->Is(CT_BRACE_OPEN))
    {
       m_chunk_map[CT_BRACE_OPEN][0] = body_start;
    }
@@ -2518,7 +2539,7 @@ void EnumStructUnionParser::set_enum_base_start(Chunk *enum_base_start)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_colon(enum_base_start))
+   if (enum_base_start->IsColon())
    {
       m_chunk_map[CT_BIT_COLON][0] = enum_base_start;
    }
@@ -2529,7 +2550,7 @@ void EnumStructUnionParser::set_inheritance_start(Chunk *inheritance_start)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_colon(inheritance_start))
+   if (inheritance_start->IsColon())
    {
       m_chunk_map[CT_COLON][0] = inheritance_start;
    }
@@ -2540,7 +2561,7 @@ void EnumStructUnionParser::set_template_end(Chunk *template_end)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(template_end, CT_ANGLE_CLOSE))
+   if (template_end->Is(CT_ANGLE_CLOSE))
    {
       m_chunk_map[CT_ANGLE_CLOSE][0] = template_end;
    }
@@ -2551,7 +2572,7 @@ void EnumStructUnionParser::set_template_start(Chunk *template_start)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(template_start, CT_ANGLE_OPEN))
+   if (template_start->Is(CT_ANGLE_OPEN))
    {
       m_chunk_map[CT_ANGLE_OPEN][0] = template_start;
    }
@@ -2562,7 +2583,7 @@ void EnumStructUnionParser::set_where_end(Chunk *where_end)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(where_end, CT_BRACE_OPEN))
+   if (where_end->Is(CT_BRACE_OPEN))
    {
       m_chunk_map[CT_WHERE][0] = where_end;
    }
@@ -2573,7 +2594,7 @@ void EnumStructUnionParser::set_where_start(Chunk *where_start)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(where_start, CT_WHERE))
+   if (where_start->Is(CT_WHERE))
    {
       m_chunk_map[CT_WHERE][0] = where_start;
    }
@@ -2595,27 +2616,55 @@ bool EnumStructUnionParser::template_detected() const
 Chunk *EnumStructUnionParser::try_find_end_chunk(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
+   LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+           __unqualified_func__, __LINE__,
+           pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
 
    do
    {
+      LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+              __unqualified_func__, __LINE__,
+              pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
+
       /**
        * clear some previously marked token types, some of which have likely
        * been erroneously marked up to this point; a good example of this
        * arises when macro variables and/or macro function calls follow the
        * class/enum/struct/union keyword and precede the actual type name
        */
-      if (  chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_WORD))
+      if (  pc->Is(CT_TYPE)
+         || pc->Is(CT_WORD))
       {
-         set_chunk_type(pc, CT_WORD);
-         set_chunk_parent(pc, CT_NONE);
+         pc->SetType(CT_WORD);
+         pc->SetParentType(CT_NONE);
       }
+      LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+              __unqualified_func__, __LINE__,
+              pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
 
       do
       {
          pc = pc->GetNextNcNnl(E_Scope::PREPROC);
+         LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+                 __unqualified_func__, __LINE__,
+                 pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
       } while (  pc->IsNotNullChunk()
-              && pc->level > m_start->level);
+              && pc->GetLevel() > m_start->GetLevel());
+
+      if (pc->IsNullChunk())
+      {
+         LOG_FMT(LFTOR, "%s(%d): IsNullChunk\n",
+                 __unqualified_func__, __LINE__);
+         // parse error
+         parse_error_detected(true);
+         return(Chunk::NullChunkPtr);
+      }
+      else
+      {
+         LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, type is %s\n",
+                 __unqualified_func__, __LINE__,
+                 pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
+      }
    } while (!is_potential_end_chunk(pc));
 
    /**
@@ -2643,29 +2692,29 @@ void EnumStructUnionParser::try_post_identify_macro_calls()
       auto  *body_start        = get_body_start();
       auto  *inheritance_start = get_inheritance_start();
       Chunk *pc                = m_start;
-      Chunk *prev              = nullptr;
+      Chunk *prev              = Chunk::NullChunkPtr;
 
       do
       {
          if (  !chunk_is_between(prev, inheritance_start, body_start)
-            && (  chunk_is_token(prev, CT_WORD)
-               || chunk_is_token(prev, CT_FUNCTION)
-               || chunk_is_token(prev, CT_FUNC_DEF))
-            && !prev->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE)
-            && prev->level == m_start->level)
+            && (  prev->Is(CT_WORD)
+               || prev->Is(CT_FUNCTION)
+               || prev->Is(CT_FUNC_DEF))
+            && !prev->GetFlags().test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE)
+            && prev->GetLevel() == m_start->GetLevel())
          {
-            if (chunk_is_paren_open(pc))
+            if (pc->IsParenOpen())
             {
                auto *paren_open  = pc;
-               auto *paren_close = chunk_skip_to_match(paren_open, E_Scope::PREPROC);
+               auto *paren_close = paren_open->GetClosingParen(E_Scope::PREPROC);
 
-               if (paren_close != nullptr)
+               if (paren_close->IsNotNullChunk())
                {
-                  set_chunk_type(paren_open, CT_FPAREN_OPEN);
-                  set_chunk_parent(paren_open, CT_MACRO_FUNC_CALL);
-                  set_chunk_type(paren_close, CT_FPAREN_CLOSE);
-                  set_chunk_parent(paren_close, CT_MACRO_FUNC_CALL);
-                  set_chunk_type(prev, CT_MACRO_FUNC_CALL);
+                  paren_open->SetType(CT_FPAREN_OPEN);
+                  paren_open->SetParentType(CT_MACRO_FUNC_CALL);
+                  paren_close->SetType(CT_FPAREN_CLOSE);
+                  paren_close->SetParentType(CT_MACRO_FUNC_CALL);
+                  prev->SetType(CT_MACRO_FUNC_CALL);
                }
             }
          }
@@ -2705,12 +2754,12 @@ void EnumStructUnionParser::try_post_identify_type()
           */
          pc = skip_scope_resolution_and_nested_name_specifiers(pc);
 
-         if (pc->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
+         if (pc->GetFlags().test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
          {
             break;
          }
-         else if (  chunk_is_token(pc, CT_WORD)
-                 || chunk_is_token(pc, CT_ANGLE_CLOSE))
+         else if (  pc->Is(CT_WORD)
+                 || pc->Is(CT_ANGLE_CLOSE))
          {
             type = skip_template_prev(pc);
          }
@@ -2732,9 +2781,9 @@ bool EnumStructUnionParser::try_pre_identify_type()
    Chunk *pc = get_body_start();
 
    if (  language_is_set(LANG_PAWN)
-      && chunk_is_enum(m_start))
+      && m_start->IsEnum())
    {
-      set_paren_parent(pc, m_start->type);
+      set_paren_parent(pc, m_start->GetType());
    }
    else if (template_detected())
    {
@@ -2748,7 +2797,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
    {
       pc = get_inheritance_start();
 
-      if (chunk_is_token(m_start, CT_UNION))
+      if (m_start->Is(CT_UNION))
       {
          /**
           * unions do not implement inheritance
@@ -2756,11 +2805,11 @@ bool EnumStructUnionParser::try_pre_identify_type()
 
          // TODO: should this be just a warning or an error (with exit condition?)
          LOG_FMT(LWARN,
-                 "%s(%d): Bad union declaration detected at orig_line is %zu, orig_col is %zu\n",
+                 "%s(%d): Bad union declaration detected at orig line is %zu, orig col is %zu\n",
                  __unqualified_func__,
                  __LINE__,
-                 m_start->orig_line,
-                 m_start->orig_col);
+                 m_start->GetOrigLine(),
+                 m_start->GetOrigCol());
 
          parse_error_detected(true);
 
@@ -2798,8 +2847,8 @@ bool EnumStructUnionParser::try_pre_identify_type()
          pc = next_next;
       }
       else if (  next->IsNotNullChunk()
-              && chunk_is_token(next, CT_WORD)
-              && chunk_is_token(next_next, CT_WORD)
+              && next->Is(CT_WORD)
+              && next_next->Is(CT_WORD)
               && m_end->GetPrevNcNnlNi() == next_next)
       {
          /**
@@ -2809,7 +2858,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
           * chunk as the type
           */
          if (  chunk_is_macro_reference(next)
-            || get_chunk_parent_type(m_start) == CT_TEMPLATE)
+            || m_start->GetParentType() == CT_TEMPLATE)
          {
             pc = m_end;
          }
@@ -2826,10 +2875,10 @@ bool EnumStructUnionParser::try_pre_identify_type()
          Chunk *prev = m_start;
 
          while (  chunk_is_between(next, m_start, m_end)
-               && (  (  chunk_is_not_token(next, CT_ASSIGN)
-                     && chunk_is_not_token(next, CT_COMMA))
-                  || next->level != m_start->level)
-               && !chunk_is_semicolon(next))
+               && (  (  next->IsNot(CT_ASSIGN)
+                     && next->IsNot(CT_COMMA))
+                  || next->GetLevel() != m_start->GetLevel())
+               && !next->IsSemicolon())
          {
             prev = next;
             next = next->GetNextNcNnl();
@@ -2846,14 +2895,14 @@ bool EnumStructUnionParser::try_pre_identify_type()
              * but it's not the type with which we're concerned
              */
             if (  next->IsSquareBracket()                       // Issue #3601
-               || chunk_is_paren_open(next))
+               || next->IsParenOpen())
             {
-               prev = chunk_skip_to_match(next, E_Scope::PREPROC);
+               prev = next->GetClosingParen(E_Scope::PREPROC);
                next = prev->GetNextNcNnl(E_Scope::PREPROC);
             }
 
-            if (  chunk_is_token(prev, CT_WORD)
-               && chunk_is_pointer_or_reference(next))
+            if (  prev->Is(CT_WORD)
+               && next->IsPointerOrReference())
             {
                pc = next;
 
@@ -2872,20 +2921,20 @@ bool EnumStructUnionParser::try_pre_identify_type()
 
       pc = pc->GetPrevNcNnlNi(E_Scope::PREPROC);
 
-      if (  chunk_is_token(pc, CT_QUALIFIER)
-         && std::strncmp(pc->str.c_str(), "final", 5) == 0)
+      if (  pc->Is(CT_QUALIFIER)
+         && std::strncmp(pc->GetStr().c_str(), "final", 5) == 0)
       {
          pc = pc->GetPrevNcNnlNi(E_Scope::PREPROC);
       }
 
       if (  language_is_set(LANG_D)
-         && chunk_is_paren_close(pc))
+         && pc->IsParenClose())
       {
-         pc = chunk_skip_to_match_rev(pc);
+         pc = pc->GetOpeningParen();
          pc = pc->GetPrevNcNnlNi();
       }
 
-      if (chunk_is_token(pc, CT_WORD))
+      if (pc->Is(CT_WORD))
       {
          mark_type(pc);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.h
index 422662da..15536e67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.h
@@ -1,7 +1,7 @@
 /**
  * @file combine_fix_mark_enum_struct_union.h
  *
- * @author
+ * @author  Joshua Parker
  * @license GPL v2+
  * extract from combine_fix_mark.h
  */
@@ -279,7 +279,7 @@ private:
    /**
     * Marks all variable identifiers associated with the class/enum/struct/union
     */
-   void mark_variable(Chunk *variable, pcf_flags_t flags);
+   void mark_variable(Chunk *variable, T_PcfFlags flags);
 
 
    /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ListManager.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ListManager.h
new file mode 100644
index 00000000..64bc5fd8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ListManager.h
@@ -0,0 +1,216 @@
+/**
+ * @file ListManager.h
+ * Template class that manages items in a double-linked list.
+ * If C++ could do it, this would just be a class that worked on an interface.
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#ifndef LIST_MANAGER_H_INCLUDED
+#define LIST_MANAGER_H_INCLUDED
+
+#include "chunk.h"
+
+/**
+ * A simple list manager for a double-linked list of Chunk items.
+ */
+class ChunkListManager
+{
+protected:
+   Chunk *m_head;  // pointer to the head of list
+   Chunk *m_tail;  // pointer to tail of list
+
+public:
+   ChunkListManager()
+   {
+      m_head = Chunk::NullChunkPtr;
+      m_tail = Chunk::NullChunkPtr;
+   }
+
+
+   /**
+    * @return pointer to first element of the linked list
+    */
+   Chunk *GetHead() const
+   {
+      return(m_head);
+   }
+
+
+   /**
+    * @return pointer to last element of the linked list
+    */
+   Chunk *GetTail() const
+   {
+      return(m_tail);
+   }
+
+
+   /**
+    * @brief remove an element from a linked list
+    * @param[in] obj chunk to remove from the list
+    */
+   void Remove(Chunk *obj)
+   {
+      if (obj != Chunk::NullChunkPtr)
+      {
+         if (m_head == obj)
+         {
+            m_head = obj->m_next;
+         }
+
+         if (m_tail == obj)
+         {
+            m_tail = obj->m_prev;
+         }
+
+         if (obj->m_next != Chunk::NullChunkPtr)
+         {
+            obj->m_next->m_prev = obj->m_prev;
+         }
+
+         if (obj->m_prev != Chunk::NullChunkPtr)
+         {
+            obj->m_prev->m_next = obj->m_next;
+         }
+         obj->m_next = Chunk::NullChunkPtr;
+         obj->m_prev = Chunk::NullChunkPtr;
+      }
+   }
+
+
+   //! swap two elements of a list
+   void Swap(Chunk *obj1, Chunk *obj2)
+   {
+      if (  obj1 != Chunk::NullChunkPtr
+         && obj2 != Chunk::NullChunkPtr)
+      {
+         if (obj1->m_prev == obj2)
+         {
+            Remove(obj1);
+            AddBefore(obj1, obj2);
+         }
+         else if (obj2->m_prev == obj1)
+         {
+            Remove(obj2);
+            AddBefore(obj2, obj1);
+         }
+         else
+         {
+            Chunk *m_prev1 = obj1->m_prev;
+            Remove(obj1);
+
+            Chunk *m_prev2 = obj2->m_prev;
+            Remove(obj2);
+
+            AddAfter(obj1, m_prev2);
+            AddAfter(obj2, m_prev1);
+         }
+      }
+   }
+
+
+   /**
+    * @brief add a new element after a reference position in a list
+    *
+    * @param obj  new element to add to list
+    * @param ref  chunk after which to insert new object
+    */
+   void AddAfter(Chunk *obj, Chunk *ref)
+   {
+      if (  obj != Chunk::NullChunkPtr
+         && ref != Chunk::NullChunkPtr)
+      {
+         obj->m_next = ref->m_next;
+         obj->m_prev = ref;
+
+         if (ref->m_next != Chunk::NullChunkPtr)
+         {
+            ref->m_next->m_prev = obj;
+         }
+         else
+         {
+            m_tail = obj;
+         }
+         ref->m_next = obj;
+      }
+   }
+
+
+   /**
+    * @brief add a new element before a reference position in a list
+    *
+    * @param obj  new element to add to list
+    * @param ref  chunk before to insert new object
+    */
+   void AddBefore(Chunk *obj, Chunk *ref)
+   {
+      if (  obj != Chunk::NullChunkPtr
+         && ref != Chunk::NullChunkPtr)
+      {
+         Remove(obj);
+         obj->m_next = ref;
+         obj->m_prev = ref->m_prev;
+
+         if (ref->m_prev != Chunk::NullChunkPtr)
+         {
+            ref->m_prev->m_next = obj;
+         }
+         else
+         {
+            m_head = obj;
+         }
+         ref->m_prev = obj;
+      }
+   }
+
+
+   /**
+    * @brief add a new element to the tail of a lis
+    *
+    * @param obj  new element to add to the list
+    */
+   void AddTail(Chunk *obj)
+   {
+      obj->m_next = Chunk::NullChunkPtr;
+      obj->m_prev = m_tail;
+
+      if (m_tail == Chunk::NullChunkPtr)
+      {
+         m_tail = obj;
+         m_head = obj;
+      }
+      else
+      {
+         m_tail->m_next = obj;
+      }
+      m_tail = obj;
+   }
+
+
+   /**
+    * @brief add a new element to the head of a list
+    *
+    * @param obj  new element to add to the list
+    */
+   void AddHead(Chunk *obj)
+   {
+      obj->m_next = m_head;
+      obj->m_prev = Chunk::NullChunkPtr;
+
+      if (m_head == Chunk::NullChunkPtr)
+      {
+         m_tail = obj;
+         m_head = obj;
+      }
+      else
+      {
+         m_head->m_prev = obj;
+      }
+      m_head = obj;
+   }
+};
+
+
+#endif /* LIST_MANAGER_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.cpp
index dc742741..837871cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.cpp
@@ -17,7 +17,6 @@
 
 using std::string;
 using std::to_string;
-using std::logic_error;
 using std::invalid_argument;
 
 using ContainerType = paren_stack_entry_t;
@@ -36,6 +35,8 @@ static ContainerType genDummy()
    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);
 }
@@ -151,7 +152,7 @@ void ParseFrame::push(std::nullptr_t, brace_stage_e stage)
    static Chunk dummy;
 
    push(&dummy, __func__, __LINE__, stage);
-   top().pc = nullptr;
+   top().pc = Chunk::NullChunkPtr;
 }
 
 
@@ -161,36 +162,36 @@ void ParseFrame::push(Chunk *pc, const char *func, int line, brace_stage_e stage
 
    ContainerType new_entry = {};
 
-   new_entry.type      = pc->type;
-   new_entry.level     = pc->level;
-   new_entry.open_line = pc->orig_line;
-   new_entry.open_colu = pc->orig_col;
+   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->flags.test(PCF_IN_PREPROC);
+   new_entry.in_preproc = pc->TestFlags(PCF_IN_PREPROC);
    new_entry.non_vardef = false;
    new_entry.ip         = top().ip;
-   new_entry.pop_pc     = nullptr;
+   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->orig_line, pc->orig_col,
-           get_token_name(pc->type), pc->brace_level, pc->level,
+   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->orig_line, pc->orig_col,
-           get_token_name(pc->type), pc->brace_level, pc->level,
+   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 */
 }
@@ -207,54 +208,58 @@ void ParseFrame::pop(const char *func, int line, Chunk *pc)
 //                        + "the stack index is already zero");
 //   }
 
-   if (  pc->type == CT_PAREN_CLOSE
-      || pc->type == CT_BRACE_CLOSE
-      || pc->type == CT_VBRACE_CLOSE
-      || pc->type == CT_FPAREN_CLOSE
-      || pc->type == CT_LPAREN_CLOSE
-      || pc->type == CT_SPAREN_CLOSE
-      || pc->type == CT_CLASS_COLON
-      || pc->type == CT_ANGLE_CLOSE
-      || pc->type == CT_SEMICOLON
-      || pc->type == CT_SQUARE_CLOSE)
+   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->orig_line, pc->orig_col, get_token_name(pc->type));
+      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->type == CT_ACCESS
-           || pc->type == CT_ASSIGN
-           || pc->type == CT_BRACE_OPEN
-           || pc->type == CT_BOOL
-           || pc->type == CT_CASE
-           || pc->type == CT_COMMA
-           || pc->type == CT_COMMENT
-           || pc->type == CT_COMMENT_CPP
-           || pc->type == CT_COMMENT_MULTI
-           || pc->type == CT_COND_COLON
-           || pc->type == CT_FPAREN_OPEN
-           || pc->type == CT_PAREN_OPEN
-           || pc->type == CT_TPAREN_OPEN
-           || pc->type == CT_MACRO_CLOSE
-           || pc->type == CT_MACRO_OPEN
-           || pc->type == CT_NEWLINE
-           || pc->type == CT_NONE
-           || pc->type == CT_OC_END
-           || pc->type == CT_OC_MSG_NAME
-           || pc->type == CT_OC_SCOPE
-           || pc->type == CT_PREPROC
-           || pc->type == CT_SQUARE_OPEN
-           || pc->type == CT_SQL_END
-           || pc->type == CT_TYPEDEF
-           || pc->type == CT_VSEMICOLON
-           || pc->type == CT_WORD)
+   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->orig_line, pc->orig_col, get_token_name(pc->type));
+      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, *** Software error ***\n",
-              func, line, pc->orig_line, pc->orig_col, get_token_name(pc->type));
+      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);
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.h
index 59d1090e..1ca0e2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.h
@@ -33,7 +33,7 @@ struct paren_stack_entry_t
    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
-   indent_ptr_t  ip;
+   T_IndentData  ip;
    Chunk         *pop_pc;
 };
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/add_space_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/add_space_table.h
index cb664d2d..d9c89388 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/add_space_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/add_space_table.h
@@ -1,4 +1,22 @@
 // *INDENT-OFF*
+
+#include "token_enum.h"
+
+//! type that stores two chunks between those no space shall occur
+struct no_space_table_t
+{
+   E_Token first;  //! first  chunk
+   E_Token second; //! second chunk
+};
+
+/**
+ * this table lists out all combos where a space MUST be present
+ * CT_UNKNOWN is a wildcard.
+ *
+ * TODO: some of these are no longer needed.
+ */
+const no_space_table_t add_space_table[] =
+{
    { CT_ACCESS,                CT_TYPE                  },
    { CT_ACCESS,                CT_WORD                  },
    { CT_ALIGN,                 CT_PAREN_OPEN            },
@@ -114,6 +132,7 @@
    { CT_FUNC_VAR,              CT_PPAREN_CLOSE          },
    { CT_GOTO,                  CT_WORD                  },
    { CT_IF,                    CT_CONSTEXPR             },
+   { CT_IGNORED,               CT_IGNORED               },
    { CT_IMPORT,                CT_WORD                  },
    { CT_INCDEC_AFTER,          CT_DEREF                 },
    { CT_IN,                    CT_TYPE                  },
@@ -187,7 +206,11 @@
    { CT_PP_INCLUDE,            CT_STRING                },
    { CT_PP_INCLUDE,            CT_WORD                  },
    { CT_PP_OTHER,              CT_PREPROC_BODY          },
+   { CT_PP_PRAGMA,             CT_PP_ENDASM             },
+   { CT_PP_PRAGMA,             CT_PP_ENDREGION          },
+   { CT_PP_PRAGMA,             CT_PP_REGION             },
    { CT_PP_PROPERTY,           CT_WORD                  },
+   { CT_PP_REGION,             CT_IGNORED               },
    { CT_PP_REGION,             CT_PREPROC_BODY          },
    { CT_PP_UNDEF,              CT_TYPE                  },
    { CT_PP_UNDEF,              CT_WORD                  },
@@ -293,4 +316,51 @@
    { CT_WORD,                  CT_WHERE_COLON           },
    { CT_WORD,                  CT_WHERE_SPEC            },
    { CT_WORD,                  CT_WORD                  },
+};
+
+/**
+ * this table lists out all combos where a space should NOT be present
+ * CT_UNKNOWN is a wildcard.
+ *
+ * TODO: some of these are no longer needed.
+ */
+const no_space_table_t no_space_table[] =
+{
+   { CT_OC_AT,          CT_UNKNOWN      },
+   { CT_INCDEC_BEFORE,  CT_WORD         },
+   { CT_UNKNOWN,        CT_INCDEC_AFTER },
+   { CT_UNKNOWN,        CT_LABEL_COLON  },
+   { CT_UNKNOWN,        CT_ACCESS_COLON },
+   { CT_UNKNOWN,        CT_SEMICOLON    },
+   { CT_UNKNOWN,        CT_D_TEMPLATE   },
+   { CT_D_TEMPLATE,     CT_UNKNOWN      },
+   { CT_MACRO_FUNC,     CT_FPAREN_OPEN  },
+   { CT_PAREN_OPEN,     CT_UNKNOWN      },
+   { CT_UNKNOWN,        CT_PAREN_CLOSE  },
+   { CT_FPAREN_OPEN,    CT_UNKNOWN      },
+   { CT_UNKNOWN,        CT_SPAREN_CLOSE },
+   { CT_SPAREN_OPEN,    CT_UNKNOWN      },
+   { CT_UNKNOWN,        CT_FPAREN_CLOSE },
+   { CT_UNKNOWN,        CT_COMMA        },
+   { CT_POS,            CT_UNKNOWN      },
+   { CT_STAR,           CT_UNKNOWN      },
+   { CT_VBRACE_CLOSE,   CT_UNKNOWN      },
+   { CT_VBRACE_OPEN,    CT_UNKNOWN      },
+   { CT_UNKNOWN,        CT_VBRACE_CLOSE },
+   { CT_UNKNOWN,        CT_VBRACE_OPEN  },
+   { CT_PREPROC,        CT_UNKNOWN      },
+   { CT_PREPROC_INDENT, CT_UNKNOWN      },
+   { CT_NEG,            CT_UNKNOWN      },
+   { CT_UNKNOWN,        CT_SQUARE_OPEN  },
+   { CT_UNKNOWN,        CT_SQUARE_CLOSE },
+   { CT_SQUARE_OPEN,    CT_UNKNOWN      },
+   { CT_PAREN_CLOSE,    CT_WORD         },
+   { CT_PAREN_CLOSE,    CT_FUNC_DEF     },
+   { CT_PAREN_CLOSE,    CT_FUNC_CALL    },
+   { CT_PAREN_CLOSE,    CT_ADDR         },
+   { CT_PAREN_CLOSE,    CT_FPAREN_OPEN  },
+   { CT_OC_SEL_NAME,    CT_OC_SEL_NAME  },
+   { CT_TYPENAME,       CT_TYPE         },
+};
+
 // *INDENT-ON*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.cpp
index 3ea306ed..66e5af3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.cpp
@@ -93,7 +93,7 @@ using namespace uncrustify;
  *     struct foo b[] = {
  *        { AD_NOT_ALLOWED, "Sorry, you failed to guess the password.",
  *          "Try again?", "Yes", "No" },
- *        { AD_SW_ERROR,    "A software error has occured.", "Bye!", NULL, NULL },
+ *        { AD_SW_ERROR,    "A software error has occurred.", "Bye!", NULL, NULL },
  *     };
  *
  *   - Trailing comments
@@ -114,7 +114,7 @@ using namespace uncrustify;
  *     typedef int32_t     INT32;
  *     typedef uint32_t    UINT32;
  */
-void align_all(void)
+void align_all()
 {
    LOG_FUNC_ENTRY();
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.h
index 110a2c86..91e87f25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.h
@@ -11,6 +11,6 @@
 #include "uncrustify_types.h"
 
 
-void align_all(void);
+void align_all();
 
 #endif /* ALIGN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.cpp
new file mode 100644
index 00000000..48d20a05
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.cpp
@@ -0,0 +1,58 @@
+/**
+ * @file align_add.cpp
+ *
+ * @author  Guy Maurel
+ * split from align.cpp
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#include "align_add.h"
+#include "uncrustify.h"
+
+
+void align_add(ChunkStack &cs, Chunk *pc, size_t &max_col)
+{
+   LOG_FUNC_ENTRY();
+
+   size_t min_col;
+   Chunk  *prev = Chunk::NullChunkPtr;
+
+   if (pc != nullptr)
+   {
+      prev = pc->GetPrev();
+   }
+
+   if (  prev->IsNullChunk()
+      || prev->IsNewline())
+   {
+      min_col = 1;
+      LOG_FMT(LALADD, "%s(%d): pc orig line=%zu, pc->col=%zu max_col=%zu min_col=%zu\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetColumn(), max_col, min_col);
+   }
+   else
+   {
+      if (prev->Is(CT_COMMENT_MULTI))
+      {
+         min_col = prev->GetOrigColEnd() + 1;
+      }
+      else
+      {
+         min_col = prev->GetColumn() + prev->Len() + 1;
+      }
+      LOG_FMT(LALADD, "%s(%d): pc orig line=%zu, pc->col=%zu max_col=%zu min_col=%zu multi:%s prev->col=%zu prev->Len()=%zu %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetColumn(), max_col, min_col, (prev->Is(CT_COMMENT_MULTI)) ? "Y" : "N",
+              (prev->Is(CT_COMMENT_MULTI)) ? prev->GetOrigColEnd() : (UINT32)prev->GetColumn(), prev->Len(), get_token_name(prev->GetType()));
+   }
+
+   if (cs.Empty())
+   {
+      max_col = 0;
+   }
+   cs.Push_Back(pc);
+
+   if (min_col > max_col)
+   {
+      max_col = min_col;
+   }
+} // align_add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.h
index e178b5bd..e178b5bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.cpp
index a04121b2..4eaca4f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.cpp
@@ -13,7 +13,7 @@
 #include "chunk.h"
 
 
-void align_asm_colon(void)
+void align_asm_colon()
 {
    LOG_FUNC_ENTRY();
 
@@ -26,7 +26,7 @@ void align_asm_colon(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_not_token(pc, CT_ASM_COLON))
+      if (pc->IsNot(CT_ASM_COLON))
       {
          pc = pc->GetNext();
          continue;
@@ -34,18 +34,18 @@ void align_asm_colon(void)
       cas.Reset();
 
       pc = pc->GetNextNcNnl(E_Scope::PREPROC);
-      size_t level = pc ? pc->level : 0;
+      size_t level = pc->IsNotNullChunk() ? pc->GetLevel() : 0;
       did_nl = true;
 
       while (  pc->IsNotNullChunk()
-            && pc->level >= level)
+            && pc->GetLevel() >= level)
       {
-         if (chunk_is_newline(pc))
+         if (pc->IsNewline())
          {
-            cas.NewLines(pc->nl_count);
+            cas.NewLines(pc->GetNlCount());
             did_nl = true;
          }
-         else if (chunk_is_token(pc, CT_ASM_COLON))
+         else if (pc->Is(CT_ASM_COLON))
          {
             cas.Flush();
             did_nl = true;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.h
index 25704404..2b0d3738 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.h
@@ -20,6 +20,6 @@
  *    : "z"(h)
  *    );
  */
-void align_asm_colon(void);
+void align_asm_colon();
 
 #endif /* ALIGN_ASM_COLON_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.cpp
new file mode 100644
index 00000000..1943e353
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.cpp
@@ -0,0 +1,290 @@
+/**
+ * @file align_assign.cpp
+ *
+ * @author  Guy Maurel
+ * split from align.cpp
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#include "align_assign.h"
+
+#include "align_stack.h"
+#include "log_rules.h"
+
+constexpr static auto LCURRENT = LALASS;
+
+using namespace uncrustify;
+
+
+Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  first == nullptr
+      || first->IsNullChunk())
+   {
+      // coveralls will complain here. There are no example for that.
+      // see https://en.wikipedia.org/wiki/Robustness_principle
+      return(nullptr);
+   }
+   size_t my_level = first->GetLevel();
+
+   char   copy[1000];
+
+   LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig line %zu, span is %zu, thresh is %zu\n",
+           __func__, __LINE__, my_level, first->ElidedText(copy), first->GetOrigLine(), span, thresh);
+
+   // If we are aligning on a tabstop, we shouldn't right-align
+   AlignStack as;    // regular assigns
+
+   as.Start(span, thresh);
+   log_rule_B("align_on_tabstop");
+   as.m_right_align = !options::align_on_tabstop();
+
+   AlignStack vdas;  // variable def assigns
+
+   vdas.Start(span, thresh);
+   vdas.m_right_align = as.m_right_align;
+
+   std::deque<AlignStack> fcnDefault(1);
+
+   fcnDefault.back().Start(span, thresh);
+   fcnDefault.back().m_right_align = as.m_right_align;
+
+   AlignStack fcnProto;
+
+   fcnProto.Start(span, thresh);
+   fcnProto.m_right_align = as.m_right_align;
+
+   size_t var_def_cnt = 0;
+   size_t equ_count   = 0;
+   size_t nl_count    = 0;
+   size_t fcn_idx     = 0;
+   size_t tmp;
+   Chunk  *pc      = first;
+   Chunk  *vdas_pc = nullptr;
+
+   while (pc->IsNotNullChunk())
+   {
+      LOG_FMT(LALASS, "%s(%d): orig line is %zu, check pc->Text() is '%s', type is %s, m_parentType is %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->ElidedText(copy), get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
+
+      if (nl_count != 0)
+      {
+         if (vdas_pc != nullptr)
+         {
+            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;
+         }
+
+         if (p_nl_count != nullptr)
+         {
+            *p_nl_count += nl_count;
+         }
+         as.NewLines(nl_count);
+         vdas.NewLines(nl_count);
+         fcnProto.NewLines(nl_count);
+
+         for (auto &fcn : fcnDefault)
+         {
+            fcn.NewLines(nl_count);
+         }
+
+         fcn_idx     = 0;
+         nl_count    = 0;
+         var_def_cnt = 0;
+         equ_count   = 0;
+      }
+
+      // Don't check inside SPAREN, PAREN or SQUARE groups
+      if (  pc->Is(CT_SPAREN_OPEN)
+            // || pc->Is(CT_FPAREN_OPEN) Issue #1340
+         || pc->Is(CT_SQUARE_OPEN)
+         || pc->Is(CT_PAREN_OPEN))
+      {
+         LOG_FMT(LALASS, "%s(%d): Don't check inside SPAREN, PAREN or SQUARE groups, type is %s\n",
+                 __func__, __LINE__, get_token_name(pc->GetType()));
+         tmp = pc->GetOrigLine();
+         pc  = pc->GetClosingParen();
+
+         if (pc->IsNotNullChunk())
+         {
+            nl_count = pc->GetOrigLine() - tmp;
+         }
+         continue;
+      }
+
+      // Recurse if a brace set is found
+      if (  (  pc->Is(CT_BRACE_OPEN)
+            || pc->Is(CT_VBRACE_OPEN))
+         && !(pc->GetParentType() == CT_BRACED_INIT_LIST))
+      {
+         size_t myspan;
+         size_t mythresh;
+
+         if (pc->GetParentType() == CT_ENUM)
+         {
+            log_rule_B("align_enum_equ_span");
+            myspan = options::align_enum_equ_span();
+            log_rule_B("align_enum_equ_thresh");
+            mythresh = options::align_enum_equ_thresh();
+         }
+         else
+         {
+            log_rule_B("align_assign_span");
+            myspan = options::align_assign_span();
+            log_rule_B("align_assign_thresh");
+            mythresh = options::align_assign_thresh();
+         }
+         pc = align_assign(pc->GetNext(), myspan, mythresh, &nl_count);
+         continue;
+      }
+
+      // Done with this brace set?
+      if (  (  pc->Is(CT_BRACE_CLOSE)
+            || pc->Is(CT_VBRACE_CLOSE))
+         && !(pc->GetParentType() == CT_BRACED_INIT_LIST))
+      {
+         pc = pc->GetNext();
+         break;
+      }
+
+      if (pc->IsNewline())
+      {
+         nl_count = pc->GetNlCount();
+      }
+      else if (  pc->TestFlags(PCF_VAR_DEF)
+              && !pc->TestFlags(PCF_IN_CONST_ARGS) // Issue #1717
+              && !pc->TestFlags(PCF_IN_FCN_DEF)    // Issue #1717
+              && !pc->TestFlags(PCF_IN_FCN_CALL))  // Issue #1717
+      {
+         // produces much more log output. Use it only debugging purpose
+         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->GetFlags():\n   ", __func__, __LINE__);
+         //log_pcf_flags(LALASS, pc->GetFlags());
+         var_def_cnt++;
+      }
+      else if (  var_def_cnt > 1
+              && !options::align_assign_on_multi_var_defs())
+      {
+         // 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;
+      }
+      else if (  equ_count == 0                  // indent only if first '=' in line
+              && !pc->TestFlags(PCF_IN_TEMPLATE) // and it is not inside a template #999
+              && (  pc->Is(CT_ASSIGN)
+                 || pc->Is(CT_ASSIGN_DEFAULT_ARG)
+                 || pc->Is(CT_ASSIGN_FUNC_PROTO)))
+      {
+         if (pc->Is(CT_ASSIGN))               // Issue #2236
+         {
+            equ_count++;
+         }
+         LOG_FMT(LALASS, "%s(%d): align_assign_decl_func() is %d\n",
+                 __func__, __LINE__, options::align_assign_decl_func());
+         // produces much more log output. Use it only debugging purpose
+         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->GetFlags(): ", __func__, __LINE__);
+         //log_pcf_flags(LALASS, pc->GetFlags());
+
+         log_rule_B("align_assign_decl_func");
+
+         if (  options::align_assign_decl_func() == 0 // Align with other assignments (default)
+            && (  pc->Is(CT_ASSIGN_DEFAULT_ARG)       // Foo( int bar = 777 );
+               || pc->Is(CT_ASSIGN_FUNC_PROTO)))      // Foo( const Foo & ) = delete;
+         {
+            LOG_FMT(LALASS, "%s(%d): fcnDefault[%zu].Add on '%s' on orig line %zu, orig col is %zu\n",
+                    __func__, __LINE__, fcn_idx, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+
+            if (++fcn_idx == fcnDefault.size())
+            {
+               fcnDefault.emplace_back();
+               fcnDefault.back().Start(span, thresh);
+               fcnDefault.back().m_right_align = as.m_right_align;
+            }
+            fcnDefault[fcn_idx].Add(pc);
+         }
+         else if (options::align_assign_decl_func() == 1)   // Align with each other
+         {
+            log_rule_B("align_assign_decl_func");
+
+            if (pc->Is(CT_ASSIGN_DEFAULT_ARG))  // Foo( int bar = 777 );
+            {
+               LOG_FMT(LALASS, "%s(%d): default: fcnDefault[%zu].Add on '%s' on orig line %zu, orig col is %zu\n",
+                       __func__, __LINE__, fcn_idx, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+
+               if (++fcn_idx == fcnDefault.size())
+               {
+                  fcnDefault.emplace_back();
+                  fcnDefault.back().Start(span, thresh);
+                  fcnDefault.back().m_right_align = as.m_right_align;
+               }
+               fcnDefault[fcn_idx].Add(pc);
+            }
+            else if (pc->Is(CT_ASSIGN_FUNC_PROTO))  // Foo( const Foo & ) = delete;
+            {
+               LOG_FMT(LALASS, "%s(%d): proto: fcnProto.Add on '%s' on orig line %zu, orig col is %zu\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+               fcnProto.Add(pc);
+            }
+            else if (pc->Is(CT_ASSIGN)) // Issue #2197
+            {
+               vdas_pc = pc;
+            }
+         }
+         else if (  options::align_assign_decl_func() == 2 // Don't align
+                 && (  pc->Is(CT_ASSIGN_DEFAULT_ARG)       // Foo( int bar = 777 );
+                    || pc->Is(CT_ASSIGN_FUNC_PROTO)))      // Foo( const Foo & ) = delete;
+         {
+            log_rule_B("align_assign_decl_func");
+            LOG_FMT(LALASS, "%s(%d): Don't align\n",               // Issue #2236
+                    __func__, __LINE__);
+         }
+         else if (var_def_cnt != 0)
+         {
+            vdas_pc = pc;
+         }
+         else
+         {
+            if (pc->Is(CT_ASSIGN))
+            {
+               LOG_FMT(LALASS, "%s(%d): as.Add on '%s' on orig line %zu, orig col is %zu\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+               as.Add(pc);
+            }
+         }
+      }
+      pc = pc->GetNext();
+   }
+
+   if (vdas_pc != nullptr)
+   {
+      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;
+   }
+   as.End();
+   vdas.End();
+
+   for (auto &fcn : fcnDefault)
+   {
+      fcn.End();
+   }
+
+   fcnProto.End();
+
+   if (pc->IsNotNullChunk())
+   {
+      LOG_FMT(LALASS, "%s(%d): done on '%s' on orig line %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine());
+   }
+   else
+   {
+      LOG_FMT(LALASS, "%s(%d): done on NULL\n", __func__, __LINE__);
+   }
+   return(pc);
+} // align_assign
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.h
index 8a23d0d5..8a23d0d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.cpp
index 3fd21394..5322586b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.cpp
@@ -26,12 +26,12 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
       // see https://en.wikipedia.org/wiki/Robustness_principle
       return(nullptr);
    }
-   size_t my_level = first->level;
+   size_t my_level = first->GetLevel();
 
    char   copy[1000];
 
-   LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig_line %zu, span is %zu, thresh is %zu\n",
-           __func__, __LINE__, my_level, first->ElidedText(copy), first->orig_line, span, thresh);
+   LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig line %zu, span is %zu, thresh is %zu\n",
+           __func__, __LINE__, my_level, first->ElidedText(copy), first->GetOrigLine(), span, thresh);
 
    // If we are aligning on a tabstop, we shouldn't right-align
 
@@ -48,29 +48,29 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
    while (  pc != nullptr
          && pc->IsNotNullChunk())
    {
-      LOG_FMT(LALASS, "%s(%d): orig_line is %zu, check pc->Text() '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->ElidedText(copy), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
+      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()));
 
       // Don't check inside SPAREN, PAREN or SQUARE groups
-      if (  chunk_is_token(pc, CT_SPAREN_OPEN)
-         || chunk_is_token(pc, CT_SQUARE_OPEN)
-         || chunk_is_token(pc, CT_PAREN_OPEN))
+      if (  pc->Is(CT_SPAREN_OPEN)
+         || pc->Is(CT_SQUARE_OPEN)
+         || pc->Is(CT_PAREN_OPEN))
       {
          LOG_FMT(LALASS, "%s(%d)OK: Don't check inside SPAREN, PAREN or SQUARE groups, type is %s\n",
-                 __func__, __LINE__, get_token_name(pc->type));
-         tmp = pc->orig_line;
-         pc  = chunk_skip_to_match(pc);
+                 __func__, __LINE__, get_token_name(pc->GetType()));
+         tmp = pc->GetOrigLine();
+         pc  = pc->GetClosingParen();
 
-         if (pc != nullptr)
+         if (pc->IsNotNullChunk())
          {
-            vdas.NewLines(pc->orig_line - tmp);
+            vdas.NewLines(pc->GetOrigLine() - tmp);
          }
          continue;
       }
 
       // Recurse if a brace set is found
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && !(get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST))
+      if (  pc->Is(CT_BRACE_OPEN)
+         && !(pc->GetParentType() == CT_BRACED_INIT_LIST))
       {
          size_t myspan;
          size_t mythresh;
@@ -96,33 +96,33 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
       }
 
       // Done with this brace set?
-      if (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            || chunk_is_token(pc, CT_VBRACE_CLOSE))
-         && !(get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST))
+      if (  (  pc->Is(CT_BRACE_CLOSE)
+            || pc->Is(CT_VBRACE_CLOSE))
+         && !(pc->GetParentType() == CT_BRACED_INIT_LIST))
       {
          pc = pc->GetNext();
          break;
       }
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         vdas.NewLines(pc->nl_count);
+         vdas.NewLines(pc->GetNlCount());
 
          if (p_nl_count != nullptr)
          {
-            *p_nl_count += pc->nl_count;
+            *p_nl_count += pc->GetNlCount();
          }
          var_def_cnt = 0;
          equ_count   = 0;
       }
-      else if (  pc->flags.test(PCF_VAR_DEF)
-              && !pc->flags.test(PCF_IN_CONST_ARGS) // Issue #1717
-              && !pc->flags.test(PCF_IN_FCN_DEF)    // Issue #1717
-              && !pc->flags.test(PCF_IN_FCN_CALL))  // Issue #1717
+      else if (  pc->TestFlags(PCF_VAR_DEF)
+              && !pc->TestFlags(PCF_IN_CONST_ARGS) // Issue #1717
+              && !pc->TestFlags(PCF_IN_FCN_DEF)    // Issue #1717
+              && !pc->TestFlags(PCF_IN_FCN_CALL))  // Issue #1717
       {
          // produces much more log output. Use it only debugging purpose
-         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags:\n   ", __func__, __LINE__);
-         //log_pcf_flags(LALASS, pc->flags);
+         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->GetFlags():\n   ", __func__, __LINE__);
+         //log_pcf_flags(LALASS, pc->GetFlags());
          var_def_cnt++;
       }
       else if (var_def_cnt > 1)
@@ -131,22 +131,22 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
          vdas.Reset();
       }
       else if (  equ_count == 0
-              && !pc->flags.test(PCF_IN_TEMPLATE)
-              && chunk_is_token(pc, CT_BRACE_OPEN)
-              && (get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST))
+              && !pc->TestFlags(PCF_IN_TEMPLATE)
+              && pc->Is(CT_BRACE_OPEN)
+              && (pc->GetParentType() == CT_BRACED_INIT_LIST))
 
       {
          equ_count++;
          LOG_FMT(LALASS, "%s(%d)OK: align_braced_init_list_span() is %d\n",
                  __func__, __LINE__, options::align_braced_init_list_span());
          // produces much more log output. Use it only debugging purpose
-         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags: ", __func__, __LINE__);
-         //log_pcf_flags(LALASS, pc->flags);
+         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->GetFlags(): ", __func__, __LINE__);
+         //log_pcf_flags(LALASS, pc->GetFlags());
 
          if (var_def_cnt != 0)
          {
-            LOG_FMT(LALASS, "%s(%d)OK: vdas.Add on '%s' on orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+            LOG_FMT(LALASS, "%s(%d)OK: vdas.Add on '%s' on orig line %zu, orig col is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
             vdas.Add(pc);
          }
       }
@@ -154,10 +154,11 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
    }
    vdas.End();
 
-   if (pc != nullptr)
+   if (  pc != nullptr
+      && pc->IsNotNullChunk())
    {
-      LOG_FMT(LALASS, "%s(%d): done on '%s' on orig_line %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line);
+      LOG_FMT(LALASS, "%s(%d): done on '%s' on orig line %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine());
    }
    else
    {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.h
index e29868e0..e29868e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.cpp
index 19b114d6..d096a9a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.cpp
@@ -19,7 +19,7 @@ constexpr static auto LCURRENT = LALIGN;
 using namespace uncrustify;
 
 
-void align_eigen_comma_init(void)
+void align_eigen_comma_init()
 {
    LOG_FUNC_ENTRY();
 
@@ -32,50 +32,42 @@ void align_eigen_comma_init(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_newline(pc))
-      {
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
-      }
-      else
-      {
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, orig_col is %zu, pc->Text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-      }
+      LOG_CHUNK(LTOK, pc);
 
       if (  start->IsNotNullChunk()
-         && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC)))
+         && ((pc->GetFlags() & PCF_IN_PREPROC) != (start->GetFlags() & PCF_IN_PREPROC)))
       {
          // a change in preproc status restarts the aligning
          as.Flush();
          start = Chunk::NullChunkPtr;
       }
-      else if (chunk_is_newline(pc))
+      else if (pc->IsNewline())
       {
-         as.NewLines(pc->nl_count);
+         as.NewLines(pc->GetNlCount());
       }
       else if (  start->IsNotNullChunk()
-              && pc->level < start->level)
+              && pc->GetLevel() < start->GetLevel())
       {
          // A drop in level restarts the aligning
          as.Flush();
          start = Chunk::NullChunkPtr;
       }
       else if (  start->IsNotNullChunk()
-              && pc->level > start->level)
+              && pc->GetLevel() > start->GetLevel())
       {
          // Ignore any deeper levels when aligning
       }
-      else if (chunk_is_token(pc, CT_SEMICOLON))
+      else if (pc->Is(CT_SEMICOLON))
       {
          // A semicolon at the same level flushes
          as.Flush();
          start = Chunk::NullChunkPtr;
       }
-      else if (  !pc->flags.test(PCF_IN_ENUM)
-              && !pc->flags.test(PCF_IN_TYPEDEF)
-              && chunk_is_str(pc, "<<"))
+      else if (  !pc->TestFlags(PCF_IN_ENUM)
+              && !pc->TestFlags(PCF_IN_TYPEDEF)
+              && pc->IsString("<<"))
       {
-         if (get_chunk_parent_type(pc) == CT_OPERATOR)
+         if (pc->GetParentType() == CT_OPERATOR)
          {
             // Ignore operator<<
          }
@@ -91,12 +83,12 @@ void align_eigen_comma_init(void)
             Chunk *prev = pc->GetPrev();
 
             if (  prev->IsNotNullChunk()
-               && chunk_is_newline(prev))
+               && prev->IsNewline())
             {
                log_rule_B("indent_columns");
-               indent_to_column(pc, pc->column_indent + options::indent_columns());
-               pc->column_indent = pc->column;
-               chunk_flags_set(pc, PCF_DONT_INDENT);
+               indent_to_column(pc, pc->GetColumnIndent() + options::indent_columns());
+               pc->SetColumnIndent(pc->GetColumn());
+               pc->SetFlagBits(PCF_DONT_INDENT);
             }
             // Restart alignment
             as.Flush();
@@ -108,8 +100,8 @@ void align_eigen_comma_init(void)
       {
          Chunk *prev = pc->GetPrev();
 
-         if (  chunk_is_newline(prev)
-            && chunk_is_token(pc->GetPrevNcNnl(), CT_COMMA))
+         if (  prev->IsNewline()
+            && pc->GetPrevNcNnl()->Is(CT_COMMA))
          {
             log_rule_B("align_eigen_comma_init");
             as.Add(pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.h
index 8f8ce34b..6647f030 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.h
@@ -9,6 +9,6 @@
 #define ALIGN_EIGEN_COMMA_INIT_H_INCLUDED
 
 //! Align comma-separated expressions following left shift operator '<<'
-void align_eigen_comma_init(void);
+void align_eigen_comma_init();
 
 #endif /* ALIGN_EIGEN_COMMA_INIT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.cpp
index fe488a10..50e04d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.cpp
@@ -23,9 +23,9 @@ Chunk *align_func_param(Chunk *start)
 {
    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",
-           __func__, __LINE__, start->Text(), start->orig_line, start->column,
-           get_token_name(start->type), start->level);
+   LOG_FMT(LAS, "AlignStack::%s(%d): Candidate is '%s': orig line is %zu, column is %zu, type is %s, level is %zu\n",
+           __func__, __LINE__, start->Text(), start->GetOrigLine(), start->GetColumn(),
+           get_token_name(start->GetType()), start->GetLevel());
    // Defaults, if the align_func_params = true
    size_t myspan   = 2;
    size_t mythresh = 0;
@@ -65,61 +65,59 @@ Chunk *align_func_param(Chunk *start)
    while ((pc = pc->GetNext())->IsNotNullChunk())
    {
       chunk_count++;
-      LOG_FMT(LFLPAREN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
-              get_token_name(pc->type));
+      LOG_CHUNK(LTOK, pc);
 
-      if (chunk_is_token(pc, CT_FUNC_VAR))                    // Issue #2278
+      if (pc->Is(CT_FUNC_VAR))                    // Issue #2278
       {
          // look after 'protect parenthesis'
          Chunk *after = pc->GetNextNc();
 
-         if (chunk_is_token(after, CT_PAREN_CLOSE))
+         if (after->Is(CT_PAREN_CLOSE))
          {
-            Chunk *before = after->GetPrevType(CT_PAREN_OPEN, after->level);
+            Chunk *before = after->GetPrevType(CT_PAREN_OPEN, after->GetLevel());
 
             if (before->IsNotNullChunk())
             {
                // these are 'protect parenthesis'
                // change the types and the level
-               set_chunk_type(before, CT_PPAREN_OPEN);
-               set_chunk_type(after, CT_PPAREN_CLOSE);
-               pc->level = before->level;
+               before->SetType(CT_PPAREN_OPEN);
+               after->SetType(CT_PPAREN_CLOSE);
+               pc->SetLevel(before->GetLevel());
                Chunk *tmp = pc->GetPrevNc();
 
-               if (chunk_is_token(tmp, CT_PTR_TYPE))
+               if (tmp->Is(CT_PTR_TYPE))
                {
-                  tmp->level = before->level;
+                  tmp->SetLevel(before->GetLevel());
                }
             }
          }
       }
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          comma_count = 0;
          chunk_count = 0;
-         many_as[pc->level].NewLines(pc->nl_count);
+         many_as[pc->GetLevel()].NewLines(pc->GetNlCount());
       }
-      else if (pc->level <= start->level)
+      else if (pc->GetLevel() <= start->GetLevel())
       {
          break;
       }
-      else if (pc->flags.test(PCF_VAR_DEF))
+      else if (pc->TestFlags(PCF_VAR_DEF))
       {
          if (chunk_count > 1)
          {
-            if (pc->level > HOW_MANY_AS)
+            if (pc->GetLevel() > HOW_MANY_AS)
             {
-               fprintf(stderr, "%s(%d): Not enought memory for Stack\n",
+               fprintf(stderr, "%s(%d): Not enough memory for Stack\n",
                        __func__, __LINE__);
                fprintf(stderr, "%s(%d): the current maximum is %zu\n",
                        __func__, __LINE__, HOW_MANY_AS);
                log_flush(true);
                exit(EX_SOFTWARE);
             }
-            max_level_is = max(max_level_is, pc->level);
-            many_as[pc->level].Add(pc);
+            max_level_is = max(max_level_is, pc->GetLevel());
+            many_as[pc->GetLevel()].Add(pc);
          }
       }
       else if (comma_count > 0)
@@ -130,9 +128,9 @@ Chunk *align_func_param(Chunk *start)
             break;
          }
       }
-      else if (chunk_is_token(pc, CT_COMMA))
+      else if (pc->Is(CT_COMMA))
       {
-         if (pc->flags.test(PCF_IN_TEMPLATE))            // Issue #2757
+         if (pc->TestFlags(PCF_IN_TEMPLATE))            // Issue #2757
          {
             LOG_FMT(LFLPAREN, "%s(%d): comma is in template\n",
                     __func__, __LINE__);
@@ -141,7 +139,7 @@ Chunk *align_func_param(Chunk *start)
          {
             Chunk *tmp_prev = pc->GetPrevNc();
 
-            if (!chunk_is_newline(tmp_prev))  // don't count leading commas
+            if (!tmp_prev->IsNewline())  // don't count leading commas
             {
                comma_count++;
                LOG_FMT(LFLPAREN, "%s(%d): comma_count is %zu\n",
@@ -162,23 +160,23 @@ Chunk *align_func_param(Chunk *start)
 } // align_func_param
 
 
-void align_func_params(void)
+void align_func_params()
 {
    LOG_FUNC_ENTRY();
    Chunk *pc = Chunk::GetHead();
 
    while ((pc = pc->GetNext())->IsNotNullChunk())
    {
-      LOG_FMT(LFLPAREN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', parent_type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
-              get_token_name(pc->type), get_token_name(pc->parent_type));
-
-      if (  chunk_is_not_token(pc, CT_FPAREN_OPEN)
-         || (  get_chunk_parent_type(pc) != CT_FUNC_PROTO
-            && get_chunk_parent_type(pc) != CT_FUNC_DEF
-            && get_chunk_parent_type(pc) != CT_FUNC_CLASS_PROTO
-            && get_chunk_parent_type(pc) != CT_FUNC_CLASS_DEF
-            && get_chunk_parent_type(pc) != CT_TYPEDEF))
+      LOG_FMT(LFLPAREN, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(),
+              get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
+
+      if (  pc->IsNot(CT_FPAREN_OPEN)
+         || (  pc->GetParentType() != CT_FUNC_PROTO
+            && pc->GetParentType() != CT_FUNC_DEF
+            && pc->GetParentType() != CT_FUNC_CLASS_PROTO
+            && pc->GetParentType() != CT_FUNC_CLASS_DEF
+            && pc->GetParentType() != CT_TYPEDEF))
       {
          continue;
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.h
index e2fbc42a..4beb8cbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.h
@@ -12,7 +12,7 @@
 
 #include "chunk.h"
 
-void align_func_params(void);
+void align_func_params();
 
 Chunk *align_func_param(Chunk *start);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.cpp
index c4c9fa0e..f56cb254 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.cpp
@@ -35,9 +35,9 @@ void align_func_proto(size_t span)
 
    // Issue #2771
    // we align token-1 and token-2 if:
-   //   token-1->level == token-2->level
+   //   token-1->GetLevel() == token-2->GetLevel()
    //   and
-   //   token-1->brace_level == token-2->brace_level
+   //   token-1->GetBraceLevel() == token-2->GetBraceLevel()
    // we don't check if token-1 and token-2 are in the same block
 
    log_rule_B("align_func_proto_star_style");
@@ -71,16 +71,16 @@ 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",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy),
-              get_token_name(pc->type), pc->level, pc->brace_level);
+      LOG_FMT(LAS, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s, level is %zu, brace level is %zu\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy),
+              get_token_name(pc->GetType()), pc->GetLevel(), pc->GetBraceLevel());
 
       // make the vector larger if necessary
-      if (  pc->level >= num_of_column                             // Issue #2960
-         || pc->brace_level >= num_of_row)
+      if (  pc->GetLevel() >= num_of_column                             // Issue #2960
+         || pc->GetBraceLevel() >= num_of_row)
       {
-         num_of_column = pc->level + 1;
-         num_of_row    = pc->brace_level + 1;
+         num_of_column = pc->GetLevel() + 1;
+         num_of_row    = pc->GetBraceLevel() + 1;
 
          many_as.resize(num_of_column);
          many_as_brace.resize(num_of_column);
@@ -92,11 +92,11 @@ void align_func_proto(size_t span)
          }
       }
 
-      if (  chunk_is_newline(pc)
-         && !pc->flags.test(PCF_IN_FCN_CALL))                 // Issue #2831
+      if (  pc->IsNewline()
+         && !pc->TestFlags(PCF_IN_FCN_CALL))                 // Issue #2831
       {
          look_bro = false;
-         AlignStack *stack_at_l_bl = many_as.at(pc->level).at(pc->brace_level);
+         AlignStack *stack_at_l_bl = many_as.at(pc->GetLevel()).at(pc->GetBraceLevel());
 
          if (stack_at_l_bl == nullptr)
          {
@@ -108,7 +108,7 @@ void align_func_proto(size_t span)
             stack_at_l_bl->m_star_style = static_cast<AlignStack::StarStyle>(mystar_style);
             stack_at_l_bl->m_amp_style  = static_cast<AlignStack::StarStyle>(myamp_style);
             // store
-            many_as.at(pc->level).at(pc->brace_level) = stack_at_l_bl;
+            many_as.at(pc->GetLevel()).at(pc->GetBraceLevel()) = stack_at_l_bl;
          }
          stack_at_l_bl->Debug();
 
@@ -120,12 +120,12 @@ void align_func_proto(size_t span)
 
                if (stack_at_l_bl != nullptr)
                {
-                  stack_at_l_bl->NewLines(pc->nl_count);
+                  stack_at_l_bl->NewLines(pc->GetNlCount());
                }
             }
          }
 
-         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->level).at(pc->brace_level);
+         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->GetLevel()).at(pc->GetBraceLevel());
 
          if (stack_at_l_bl_brace == nullptr)
          {
@@ -135,19 +135,19 @@ void align_func_proto(size_t span)
             stack_at_l_bl_brace->Start(myspan, mythresh);
             stack_at_l_bl_brace->m_gap = mybr_gap;
             // store
-            many_as_brace.at(pc->level).at(pc->brace_level) = stack_at_l_bl_brace;
+            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->NewLines(pc->nl_count);
+         stack_at_l_bl_brace->NewLines(pc->GetNlCount());
       }
-      else if (  chunk_is_token(pc, CT_FUNC_PROTO)
-              || (  chunk_is_token(pc, CT_FUNC_DEF)
+      else if (  pc->Is(CT_FUNC_PROTO)
+              || (  pc->Is(CT_FUNC_DEF)
                  && options::align_single_line_func()))
       {
          log_rule_B("align_single_line_func");
          log_rule_B("align_on_operator");
 
-         if (  get_chunk_parent_type(pc) == CT_OPERATOR
+         if (  pc->GetParentType() == CT_OPERATOR
             && options::align_on_operator())
          {
             toadd = pc->GetPrevNcNnl();
@@ -157,11 +157,11 @@ 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",
-                 __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col,
-                 tmp->level, tmp->brace_level);
+         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
-         AlignStack *stack_at_l_bl = many_as.at(pc->level).at(pc->brace_level);
+         AlignStack *stack_at_l_bl = many_as.at(pc->GetLevel()).at(pc->GetBraceLevel());
 
          if (stack_at_l_bl == nullptr)
          {
@@ -173,25 +173,25 @@ void align_func_proto(size_t span)
             stack_at_l_bl->m_star_style = static_cast<AlignStack::StarStyle>(mystar_style);
             stack_at_l_bl->m_amp_style  = static_cast<AlignStack::StarStyle>(myamp_style);
             // store
-            many_as.at(pc->level).at(pc->brace_level) = stack_at_l_bl;
+            many_as.at(pc->GetLevel()).at(pc->GetBraceLevel()) = stack_at_l_bl;
          }
          stack_at_l_bl->Add(tmp);
          log_rule_B("align_single_line_brace");
-         look_bro = (chunk_is_token(pc, CT_FUNC_DEF))
+         look_bro = (pc->Is(CT_FUNC_DEF))
                     && options::align_single_line_brace();
       }
       else if (  look_bro
-              && chunk_is_token(pc, CT_BRACE_OPEN)
-              && pc->flags.test(PCF_ONE_LINER))
+              && pc->Is(CT_BRACE_OPEN)
+              && pc->TestFlags(PCF_ONE_LINER))
       {
-         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->level).at(pc->brace_level);
+         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->GetLevel()).at(pc->GetBraceLevel());
 
          if (stack_at_l_bl_brace == nullptr)
          {
             stack_at_l_bl_brace = new AlignStack();
             stack_at_l_bl_brace->Start(myspan, mythresh);
-            stack_at_l_bl_brace->m_gap                      = mybr_gap;
-            many_as_brace.at(pc->level).at(pc->brace_level) = stack_at_l_bl_brace;
+            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);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.h
index 811020e0..811020e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.cpp
index ed1d2d39..02d60f17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.cpp
@@ -29,15 +29,15 @@ void align_init_brace(Chunk *start)
    cpd.al_cnt       = 0;
    cpd.al_c99_array = false;
 
-   LOG_FMT(LALBR, "%s(%d): start @ orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->orig_line, start->orig_col);
+   LOG_FMT(LALBR, "%s(%d): start @ orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
 
    Chunk *pc       = start->GetNextNcNnl();
-   Chunk *pcSingle = scan_ib_line(pc, true);
+   Chunk *pcSingle = scan_ib_line(pc);
 
    if (  pcSingle == nullptr
-      || (  chunk_is_token(pcSingle, CT_BRACE_CLOSE)
-         && get_chunk_parent_type(pcSingle) == CT_ASSIGN))
+      || (  pcSingle->Is(CT_BRACE_CLOSE)
+         && pcSingle->GetParentType() == CT_ASSIGN))
    {
       // single line - nothing to do
       LOG_FMT(LALBR, "%s(%d): single line - nothing to do\n", __func__, __LINE__);
@@ -47,23 +47,23 @@ void align_init_brace(Chunk *start)
 
    do
    {
-      pc = scan_ib_line(pc, false);
+      pc = scan_ib_line(pc);
 
       // debug dump the current frame
-      LOG_FMT(LALBR, "%s(%d): debug dump after, orig_line is %zu\n",
-              __func__, __LINE__, pc->orig_line);
-      align_log_al(LALBR, pc->orig_line);
+      LOG_FMT(LALBR, "%s(%d): debug dump after, orig line is %zu\n",
+              __func__, __LINE__, pc->GetOrigLine());
+      align_log_al(LALBR, pc->GetOrigLine());
 
-      while (chunk_is_newline(pc))
+      while (pc->IsNewline())
       {
          pc = pc->GetNext();
       }
    } while (  pc != nullptr
            && pc->IsNotNullChunk()
-           && pc->level > start->level);
+           && pc->GetLevel() > start->GetLevel());
 
    // debug dump the current frame
-   align_log_al(LALBR, start->orig_line);
+   align_log_al(LALBR, start->GetOrigLine());
 
    log_rule_B("align_on_tabstop");
 
@@ -86,62 +86,66 @@ void align_init_brace(Chunk *start)
          pc = tmp;
 
          LOG_FMT(LALBR, " -%zu- skipped '[] =' to %s\n",
-                 pc->orig_line, get_token_name(pc->type));
+                 pc->GetOrigLine(), get_token_name(pc->GetType()));
          continue;
       }
       Chunk *next = pc;
 
       if (idx < cpd.al_cnt)
       {
-         LOG_FMT(LALBR, " (%zu) check %s vs %s -- ",
-                 idx, get_token_name(pc->type), get_token_name(cpd.al[idx].type));
+         LOG_FMT(LALBR, "%s(%d): (%zu) check %s vs %s -- ??\n",
+                 __func__, __LINE__, idx, get_token_name(pc->GetType()), get_token_name(cpd.al[idx].type));
 
-         if (chunk_is_token(pc, cpd.al[idx].type))
+         if (pc->Is(cpd.al[idx].type))
          {
             if (  idx == 0
                && cpd.al_c99_array)
             {
                Chunk *prev = pc->GetPrev();
 
-               if (chunk_is_newline(prev))
+               if (prev->IsNewline())
                {
-                  chunk_flags_set(pc, PCF_DONT_INDENT);
+                  pc->SetFlagBits(PCF_DONT_INDENT);
                }
             }
-            LOG_FMT(LALBR, " [%s] to col %zu\n", pc->Text(), cpd.al[idx].col);
+            LOG_FMT(LALBR, "%s(%d): cpd.al[%zu].col is %zu\n",
+                    __func__, __LINE__, idx, cpd.al[idx].col);
+            LOG_FMT(LALBR, "%s(%d): (idx is %zu) check %s vs %s -- [%s] to col %zu\n",
+                    __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)
             {
-               int col_diff = pc->column - num_token->column;
+               int col_diff = pc->GetColumn() - num_token->GetColumn();
 
                reindent_line(num_token, cpd.al[idx].col - col_diff);
                //LOG_FMT(LSYS, "-= %zu =- NUM indent [%s] col=%d diff=%d\n",
-               //        num_token->orig_line,
+               //        num_token->GetOrigLine(),
                //        num_token->Text(), cpd.al[idx - 1].col, col_diff);
 
-               chunk_flags_set(num_token, PCF_WAS_ALIGNED);
+               num_token->SetFlagBits(PCF_WAS_ALIGNED);
                num_token = nullptr;
             }
 
             // Comma's need to 'fall back' to the previous token
-            if (chunk_is_token(pc, CT_COMMA))
+            if (pc->Is(CT_COMMA))
             {
                next = pc->GetNext();
 
-               if (!chunk_is_newline(next))
+               if (!next->IsNewline())
                {
                   //LOG_FMT(LSYS, "-= %zu =- indent [%s] col=%d len=%d\n",
-                  //        next->orig_line,
+                  //        next->GetOrigLine(),
                   //        next->Text(), cpd.al[idx].col, cpd.al[idx].len);
 
                   log_rule_B("align_number_right");
 
                   if (  (idx < (cpd.al_cnt - 1))
                      && options::align_number_right()
-                     && (  chunk_is_token(next, CT_NUMBER_FP)
-                        || chunk_is_token(next, CT_NUMBER)
-                        || chunk_is_token(next, CT_POS)
-                        || chunk_is_token(next, CT_NEG)))
+                     && (  next->Is(CT_NUMBER_FP)
+                        || next->Is(CT_NUMBER)
+                        || next->Is(CT_POS)
+                        || next->Is(CT_NEG)))
                   {
                      // Need to wait until the next match to indent numbers
                      num_token = next;
@@ -151,7 +155,7 @@ void align_init_brace(Chunk *start)
                      LOG_FMT(LALBR, "%s(%d): idx is %zu, al_cnt is %zu, cpd.al[%zu].col is %zu, cpd.al[%zu].len is %zu\n",
                              __func__, __LINE__, idx, cpd.al_cnt, idx, cpd.al[idx].col, idx, cpd.al[idx].len);
                      reindent_line(next, cpd.al[idx].col + cpd.al[idx].len);
-                     chunk_flags_set(next, PCF_WAS_ALIGNED);
+                     next->SetFlagBits(PCF_WAS_ALIGNED);
                   }
                }
             }
@@ -161,7 +165,7 @@ void align_init_brace(Chunk *start)
                LOG_FMT(LALBR, "%s(%d): idx is %zu, cpd.al[%zu].col is %zu\n",
                        __func__, __LINE__, idx, idx, cpd.al[idx].col);
                reindent_line(pc, cpd.al[idx].col);
-               chunk_flags_set(pc, PCF_WAS_ALIGNED);
+               pc->SetFlagBits(PCF_WAS_ALIGNED);
 
                // see if we need to right-align a number
                log_rule_B("align_number_right");
@@ -171,11 +175,11 @@ void align_init_brace(Chunk *start)
                {
                   next = pc->GetNext();
 
-                  if (  !chunk_is_newline(next)
-                     && (  chunk_is_token(next, CT_NUMBER_FP)
-                        || chunk_is_token(next, CT_NUMBER)
-                        || chunk_is_token(next, CT_POS)
-                        || chunk_is_token(next, CT_NEG)))
+                  if (  !next->IsNewline()
+                     && (  next->Is(CT_NUMBER_FP)
+                        || next->Is(CT_NUMBER)
+                        || next->Is(CT_POS)
+                        || next->Is(CT_NEG)))
                   {
                      // Need to wait until the next match to indent numbers
                      num_token = next;
@@ -186,17 +190,17 @@ void align_init_brace(Chunk *start)
          }
          else
          {
-            LOG_FMT(LALBR, " no match\n");
+            LOG_FMT(LALBR, "%s(%d): (%zu) check %s vs %s -- no match\n",
+                    __func__, __LINE__, idx, get_token_name(pc->GetType()), get_token_name(cpd.al[idx].type));
          }
       }
 
-      if (  chunk_is_newline(pc)
-         || chunk_is_newline(next))
+      if (  pc->IsNewline()
+         || next->IsNewline())
       {
          idx = 0;
       }
       pc = pc->GetNext();
-   } while (  pc != nullptr
-           && pc->IsNotNullChunk()
-           && pc->level > start->level);
+   } while (  pc->IsNotNullChunk()
+           && pc->GetLevel() > start->GetLevel());
 } // align_init_brace
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.h
index c749eb54..c749eb54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.cpp
index 21ef4ba6..6ac2175c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.cpp
@@ -18,7 +18,7 @@ constexpr static auto LCURRENT = LALIGN;
 using namespace uncrustify;
 
 
-void align_left_shift(void)
+void align_left_shift()
 {
    LOG_FUNC_ENTRY();
 
@@ -31,51 +31,51 @@ void align_left_shift(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
+         LOG_FMT(LALIGN, "%s(%d): orig line is %zu, <Newline>\n", __func__, __LINE__, pc->GetOrigLine());
       }
       else
       {
          char copy[1000];
-         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, orig_col is %zu, pc->Text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy));
+         LOG_FMT(LALIGN, "%s(%d): orig line is %zu, orig col is %zu, pc->Text() '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy));
       }
 
       if (  start->IsNotNullChunk()
-         && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC)))
+         && ((pc->GetFlags() & PCF_IN_PREPROC) != (start->GetFlags() & PCF_IN_PREPROC)))
       {
          // a change in preproc status restarts the aligning
          as.Flush();
          start = Chunk::NullChunkPtr;
       }
-      else if (chunk_is_newline(pc))
+      else if (pc->IsNewline())
       {
-         as.NewLines(pc->nl_count);
+         as.NewLines(pc->GetNlCount());
       }
       else if (  start->IsNotNullChunk()
-              && pc->level < start->level)
+              && pc->GetLevel() < start->GetLevel())
       {
          // A drop in level restarts the aligning
          as.Flush();
          start = Chunk::NullChunkPtr;
       }
       else if (  start->IsNotNullChunk()
-              && pc->level > start->level)
+              && pc->GetLevel() > start->GetLevel())
       {
          // Ignore any deeper levels when aligning
       }
-      else if (chunk_is_token(pc, CT_SEMICOLON))
+      else if (pc->Is(CT_SEMICOLON))
       {
          // A semicolon at the same level flushes
          as.Flush();
          start = Chunk::NullChunkPtr;
       }
-      else if (  !pc->flags.test(PCF_IN_ENUM)
-              && !pc->flags.test(PCF_IN_TYPEDEF)
-              && chunk_is_str(pc, "<<"))
+      else if (  !pc->TestFlags(PCF_IN_ENUM)
+              && !pc->TestFlags(PCF_IN_TYPEDEF)
+              && pc->IsString("<<"))
       {
-         if (get_chunk_parent_type(pc) == CT_OPERATOR)
+         if (pc->GetParentType() == CT_OPERATOR)
          {
             // Ignore operator<<
          }
@@ -91,18 +91,18 @@ void align_left_shift(void)
             Chunk *prev = pc->GetPrev();
 
             if (  prev->IsNotNullChunk()
-               && chunk_is_newline(prev))
+               && prev->IsNewline())
             {
                log_rule_B("indent_columns");
-               indent_to_column(pc, pc->column_indent + options::indent_columns());
-               pc->column_indent = pc->column;
-               chunk_flags_set(pc, PCF_DONT_INDENT);
+               indent_to_column(pc, pc->GetColumnIndent() + options::indent_columns());
+               pc->SetColumnIndent(pc->GetColumn());
+               pc->SetFlagBits(PCF_DONT_INDENT);
             }
             // first one can be anywhere
             as.Add(pc);
             start = pc;
          }
-         else if (chunk_is_newline(pc->GetPrev()))
+         else if (pc->GetPrev()->IsNewline())
          {
             // subsequent ones must be after a newline
             as.Add(pc);
@@ -120,12 +120,12 @@ void align_left_shift(void)
          Chunk *prev = pc->GetPrev();
 
          if (  prev->IsNotNullChunk()
-            && chunk_is_newline(prev))
+            && prev->IsNewline())
          {
             log_rule_B("indent_columns");
-            indent_to_column(pc, pc->column_indent + options::indent_columns());
-            pc->column_indent = pc->column;
-            chunk_flags_set(pc, PCF_DONT_INDENT);
+            indent_to_column(pc, pc->GetColumnIndent() + options::indent_columns());
+            pc->SetColumnIndent(pc->GetColumn());
+            pc->SetFlagBits(PCF_DONT_INDENT);
          }
       }
       pc = pc->GetNext();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.h
index 47d9eb81..d02155b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.h
@@ -11,6 +11,6 @@
 #define ALIGN_LEFT_SHIFT_H_INCLUDED
 
 //! Align left shift operators '<<' (CT_SHIFT)
-void align_left_shift(void);
+void align_left_shift();
 
 #endif /* ALIGN_LEFT_SHIFT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.cpp
index 802b0280..802b0280 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.h
index 8cb2ece8..8cb2ece8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.cpp
index 4a3fd689..8ff71508 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.cpp
@@ -18,7 +18,7 @@ Chunk *align_nl_cont(Chunk *start)
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LALNLC, "%s(%d): start on [%s] on line %zu\n",
-           __func__, __LINE__, get_token_name(start->type), start->orig_line);
+           __func__, __LINE__, get_token_name(start->GetType()), start->GetOrigLine());
 
    // Find the max column
    ChunkStack cs;
@@ -26,10 +26,10 @@ Chunk *align_nl_cont(Chunk *start)
    Chunk      *pc     = start;
 
    while (  pc->IsNotNullChunk()
-         && chunk_is_not_token(pc, CT_NEWLINE)
-         && chunk_is_not_token(pc, CT_COMMENT_MULTI))
+         && pc->IsNot(CT_NEWLINE)
+         && pc->IsNot(CT_COMMENT_MULTI))
    {
-      if (chunk_is_token(pc, CT_NL_CONT))
+      if (pc->Is(CT_NL_CONT))
       {
          align_add(cs, pc, max_col);
       }
@@ -40,23 +40,23 @@ Chunk *align_nl_cont(Chunk *start)
 
    while ((tmp = cs.Pop_Back()) != nullptr)
    {
-      chunk_flags_set(tmp, PCF_WAS_ALIGNED);
-      tmp->column = max_col;
+      tmp->SetFlagBits(PCF_WAS_ALIGNED);
+      tmp->SetColumn(max_col);
    }
    return(pc);
 } // align_nl_cont
 
 
-void align_backslash_newline(void)
+void align_backslash_newline()
 {
    LOG_FUNC_ENTRY();
    Chunk *pc = Chunk::GetHead();
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_not_token(pc, CT_NL_CONT))
+      if (pc->IsNot(CT_NL_CONT))
       {
-         pc = pc->GetNextType(CT_NL_CONT, -1);
+         pc = pc->GetNextType(CT_NL_CONT);
          continue;
       }
       pc = align_nl_cont(pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.h
index 7db6bad6..05a046ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.h
@@ -28,6 +28,6 @@ Chunk *align_nl_cont(Chunk *start);
  * Aligns all backslash-newline combos in the file.
  * This should be done LAST.
  */
-void align_backslash_newline(void);
+void align_backslash_newline();
 
 #endif /* ALIGN_NL_COUNT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.cpp
index 8c0bc078..35b4b58e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.cpp
@@ -16,7 +16,7 @@
 using namespace uncrustify;
 
 
-void align_oc_decl_colon(void)
+void align_oc_decl_colon()
 {
    LOG_FUNC_ENTRY();
 
@@ -32,7 +32,7 @@ void align_oc_decl_colon(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_not_token(pc, CT_OC_SCOPE))
+      if (pc->IsNot(CT_OC_SCOPE))
       {
          pc = pc->GetNext();
          continue;
@@ -40,29 +40,29 @@ void align_oc_decl_colon(void)
       nas.Reset();
       cas.Reset();
 
-      size_t level = pc->level;
+      size_t level = pc->GetLevel();
       pc = pc->GetNextNcNnl(E_Scope::PREPROC);
 
       did_line = false;
 
       while (  pc->IsNotNullChunk()
-            && pc->level >= level)
+            && pc->GetLevel() >= level)
       {
          // The declaration ends with an open brace or semicolon
-         if (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_semicolon(pc))
+         if (  pc->Is(CT_BRACE_OPEN)
+            || pc->IsSemicolon())
          {
             break;
          }
 
-         if (chunk_is_newline(pc))
+         if (pc->IsNewline())
          {
-            nas.NewLines(pc->nl_count);
-            cas.NewLines(pc->nl_count);
+            nas.NewLines(pc->GetNlCount());
+            cas.NewLines(pc->GetNlCount());
             did_line = false;
          }
          else if (  !did_line
-                 && chunk_is_token(pc, CT_OC_COLON))
+                 && pc->Is(CT_OC_COLON))
          {
             cas.Add(pc);
 
@@ -70,13 +70,13 @@ void align_oc_decl_colon(void)
             Chunk *tmp2 = tmp->GetPrevNcNnl(E_Scope::PREPROC);
 
             // Check for an un-labeled parameter
-            if (  (  chunk_is_token(tmp, CT_WORD)
-                  || chunk_is_token(tmp, CT_TYPE)
-                  || chunk_is_token(tmp, CT_OC_MSG_DECL)
-                  || chunk_is_token(tmp, CT_OC_MSG_SPEC))
-               && (  chunk_is_token(tmp2, CT_WORD)
-                  || chunk_is_token(tmp2, CT_TYPE)
-                  || chunk_is_token(tmp2, CT_PAREN_CLOSE)))
+            if (  (  tmp->Is(CT_WORD)
+                  || tmp->Is(CT_TYPE)
+                  || tmp->Is(CT_OC_MSG_DECL)
+                  || tmp->Is(CT_OC_MSG_SPEC))
+               && (  tmp2->Is(CT_WORD)
+                  || tmp2->Is(CT_TYPE)
+                  || tmp2->Is(CT_PAREN_CLOSE)))
             {
                nas.Add(tmp);
             }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.h
index 370ee655..b44b11ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.h
@@ -16,6 +16,6 @@
  * -(void) doSomething: (NSString*) param1
  *                with: (NSString*) param2
  */
-void align_oc_decl_colon(void);
+void align_oc_decl_colon();
 
 #endif /* ALIGN_OC_DECL_COLON_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.cpp
index 7357bb18..ffb6a4eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.cpp
@@ -33,7 +33,7 @@ void align_oc_msg_colon(Chunk *so)
 
    cas.Start(span);
 
-   size_t level = so->level;
+   size_t level = so->GetLevel();
    Chunk  *pc   = so->GetNextNcNnl(E_Scope::PREPROC);
 
    bool   did_line   = false;
@@ -42,13 +42,13 @@ void align_oc_msg_colon(Chunk *so)
    bool   first_line = true;
 
    while (  pc->IsNotNullChunk()
-         && pc->level > level)
+         && pc->GetLevel() > level)
    {
-      if (pc->level > (level + 1))
+      if (pc->GetLevel() > (level + 1))
       {
          // do nothing
       }
-      else if (chunk_is_newline(pc))
+      else if (pc->IsNewline())
       {
          if (!has_colon)
          {
@@ -69,18 +69,18 @@ void align_oc_msg_colon(Chunk *so)
       }
       else if (  !did_line
               && (lcnt < span + 1)
-              && chunk_is_token(pc, CT_OC_COLON))
+              && pc->Is(CT_OC_COLON))
       {
          has_colon = true;
          cas.Add(pc);
          Chunk *tmp = pc->GetPrev();
 
          if (  tmp->IsNotNullChunk()
-            && (  chunk_is_token(tmp, CT_OC_MSG_FUNC)
-               || chunk_is_token(tmp, CT_OC_MSG_NAME)))
+            && (  tmp->Is(CT_OC_MSG_FUNC)
+               || tmp->Is(CT_OC_MSG_NAME)))
          {
             nas.Add(tmp);
-            chunk_flags_set(tmp, PCF_DONT_INDENT);
+            tmp->SetFlagBits(PCF_DONT_INDENT);
          }
          did_line = true;
       }
@@ -103,7 +103,7 @@ void align_oc_msg_colon(Chunk *so)
 
       if (tmp != nullptr)
       {
-         size_t tlen = tmp->str.size();
+         size_t tlen = tmp->GetStr().size();
 
          if (tlen > mlen)
          {
@@ -136,45 +136,45 @@ void align_oc_msg_colon(Chunk *so)
    if (  longest != nullptr
       && options::indent_oc_msg_prioritize_first_colon()
       && len_diff > 0
-      && (  (longest->column >= len_diff)
-         && (longest->column - len_diff) > (longest->brace_level * indent_size)))
+      && (  (longest->GetColumn() >= len_diff)
+         && (longest->GetColumn() - len_diff) > (longest->GetBraceLevel() * indent_size)))
    {
-      longest->column -= len_diff;
+      longest->SetColumn(longest->GetColumn() - len_diff);
    }
    else if (  longest != nullptr
            && len > 0)
    {
       Chunk chunk;
 
-      set_chunk_type(&chunk, CT_SPACE);
-      set_chunk_parent(&chunk, CT_NONE);
-      chunk.orig_line   = longest->orig_line;
-      chunk.orig_col    = longest->orig_col;
-      chunk.level       = longest->level;
-      chunk.brace_level = longest->brace_level;
-      chunk.flags       = longest->flags & PCF_COPY_FLAGS;
+      chunk.SetType(CT_SPACE);
+      chunk.SetParentType(CT_NONE);
+      chunk.SetOrigLine(longest->GetOrigLine());
+      chunk.SetOrigCol(longest->GetOrigCol());
+      chunk.SetLevel(longest->GetLevel());
+      chunk.SetBraceLevel(longest->GetBraceLevel());
+      chunk.SetFlags(longest->GetFlags() & PCF_COPY_FLAGS);
 
       // start at one since we already indent for the '['
       for (size_t idx = 1; idx < len; idx++)
       {
-         chunk.str.append(' ');
+         chunk.Str().append(' ');
       }
 
-      chunk_add_before(&chunk, longest);
+      chunk.CopyAndAddBefore(longest);
    }
    nas.End();
    cas.End();
 } // align_oc_msg_colon
 
 
-void align_oc_msg_colons(void)
+void align_oc_msg_colons()
 {
    LOG_FUNC_ENTRY();
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-         && get_chunk_parent_type(pc) == CT_OC_MSG)
+      if (  pc->Is(CT_SQUARE_OPEN)
+         && pc->GetParentType() == CT_OC_MSG)
       {
          align_oc_msg_colon(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.h
index 4d8ea07d..0bbb7b6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.h
@@ -11,6 +11,6 @@
 #define ALIGN_OC_MSG_COLONS_H_INCLUDED
 
 //! Aligns OC messages
-void align_oc_msg_colons(void);
+void align_oc_msg_colons();
 
 #endif /* ALIGN_OC_MSG_COLONS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.cpp
index 4c7a2dd5..88671254 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.cpp
@@ -23,11 +23,11 @@ void align_oc_msg_spec(size_t span)
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         as.NewLines(pc->nl_count);
+         as.NewLines(pc->GetNlCount());
       }
-      else if (chunk_is_token(pc, CT_OC_MSG_SPEC))
+      else if (pc->Is(CT_OC_MSG_SPEC))
       {
          as.Add(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.h
index b6500a6e..b6500a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.cpp
index b05c0dd9..18a853ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.cpp
@@ -17,7 +17,7 @@ constexpr static auto LCURRENT = LALPP;
 using namespace uncrustify;
 
 
-void align_preprocessor(void)
+void align_preprocessor()
 {
    LOG_FUNC_ENTRY();
 
@@ -38,18 +38,17 @@ void align_preprocessor(void)
 
    Chunk *pc = Chunk::GetHead();
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       // Note: not counting back-slash newline combos
-      if (chunk_is_token(pc, CT_NEWLINE))   // mind the gap: chunk_is_newline(pc) is NOT the same!
+      if (pc->Is(CT_NEWLINE))   // mind the gap: pc->IsNewline() is NOT the same!
       {
-         as.NewLines(pc->nl_count);
-         asf.NewLines(pc->nl_count);
+         as.NewLines(pc->GetNlCount());
+         asf.NewLines(pc->GetNlCount());
       }
 
       // If we aren't on a 'define', then skip to the next non-comment
-      if (chunk_is_not_token(pc, CT_PP_DEFINE))
+      if (pc->IsNot(CT_PP_DEFINE))
       {
          pc = pc->GetNextNc();
          continue;
@@ -64,11 +63,11 @@ void align_preprocessor(void)
          break;
       }
       LOG_FMT(LALPP, "%s(%d): define (%s) on line %zu col %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
 
       cur_as = &as;
 
-      if (chunk_is_token(pc, CT_MACRO_FUNC))
+      if (pc->Is(CT_MACRO_FUNC))
       {
          log_rule_B("align_pp_define_together");
 
@@ -78,10 +77,10 @@ void align_preprocessor(void)
          }
          // Skip to the close parenthesis
          pc = pc->GetNextNc(); // point to open (
-         pc = pc->GetNextType(CT_FPAREN_CLOSE, pc->level);
+         pc = pc->GetNextType(CT_FPAREN_CLOSE, pc->GetLevel());
 
          LOG_FMT(LALPP, "%s(%d): jumped to (%s) on line %zu col %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+                 __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
       }
       // step to the value past the close parenthesis or the macro name
       pc = pc->GetNext();
@@ -97,10 +96,10 @@ void align_preprocessor(void)
        * don't align anything if the first line ends with a newline before
        * a value is given
        */
-      if (!chunk_is_newline(pc))
+      if (!pc->IsNewline())
       {
          LOG_FMT(LALPP, "%s(%d): align on '%s', line %zu col %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+                 __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
 
          cur_as->Add(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.h
index ec944587..1095c94e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.h
@@ -13,6 +13,6 @@
 #include "uncrustify_types.h"
 
 //! Scans the whole file for #defines. Aligns all within X lines of each other
-void align_preprocessor(void);
+void align_preprocessor();
 
 #endif /* ALIGN_PREPROCESSOR_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.cpp
index 588195da..6b17ab90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.cpp
@@ -17,7 +17,7 @@ constexpr static auto LCURRENT = LASFCP;
 using namespace uncrustify;
 
 
-void align_same_func_call_params(void)
+void align_same_func_call_params()
 {
    LOG_FUNC_ENTRY();
 
@@ -51,32 +51,32 @@ void align_same_func_call_params(void)
 
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         LOG_FMT(LAS, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
+         LOG_FMT(LAS, "%s(%d): 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->orig_line, pc->orig_col, pc->Text());
+         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());
       }
 
-      if (chunk_is_not_token(pc, CT_FUNC_CALL))
+      if (pc->IsNot(CT_FUNC_CALL))
       {
-         if (chunk_is_newline(pc))
+         if (pc->IsNewline())
          {
             for (auto &as_v : array_of_AlignStack)
             {
-               as_v.NewLines(pc->nl_count);
+               as_v.NewLines(pc->GetNlCount());
             }
 
-            fcn_as.NewLines(pc->nl_count);
+            fcn_as.NewLines(pc->GetNlCount());
          }
          else
          {
             // if we drop below the brace level that started it, we are done
             if (  align_root->IsNotNullChunk()
-               && align_root->brace_level > pc->brace_level)
+               && align_root->GetBraceLevel() > pc->GetBraceLevel())
             {
                LOG_FMT(LASFCP, "  ++ (drop) Ended with %zu fcns\n", align_len);
 
@@ -96,12 +96,12 @@ void align_same_func_call_params(void)
       // Only align function calls that are right after a newline
       Chunk *prev = pc->GetPrev();
 
-      while (  chunk_is_token(prev, CT_MEMBER)
-            || chunk_is_token(prev, CT_DC_MEMBER))
+      while (  prev->Is(CT_MEMBER)
+            || prev->Is(CT_DC_MEMBER))
       {
          Chunk *tprev = prev->GetPrev();
 
-         if (chunk_is_not_token(tprev, CT_TYPE))
+         if (tprev->IsNot(CT_TYPE))
          {
             prev = tprev;
             break;
@@ -109,7 +109,7 @@ void align_same_func_call_params(void)
          prev = tprev->GetPrev();
       }
 
-      if (!chunk_is_newline(prev))
+      if (!prev->IsNewline())
       {
          continue;
       }
@@ -120,13 +120,13 @@ void align_same_func_call_params(void)
 
       while (prev != pc)
       {
-         align_fcn_name += prev->str;
+         align_fcn_name += prev->GetStr();
          prev            = prev->GetNext();
       }
-      align_fcn_name += pc->str;
-      LOG_FMT(LASFCP, "%s(%d): Func Call found at orig_line is %zu, orig_col is %zu, c_str() '%s'\n",
-              __func__, __LINE__, align_fcn->orig_line,
-              align_fcn->orig_col,
+      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",
+              __func__, __LINE__, align_fcn->GetOrigLine(),
+              align_fcn->GetOrigCol(),
               align_fcn_name.c_str());
 
       add_str = nullptr;
@@ -138,13 +138,13 @@ void align_same_func_call_params(void)
          // and on the same level
          LOG_FMT(LASFCP, "%s(%d):align_root is not nullptr\n", __func__, __LINE__);
 
-         if (  align_root->brace_level == pc->brace_level
-            && align_root->level == pc->level
+         if (  align_root->GetBraceLevel() == pc->GetBraceLevel()
+            && align_root->GetLevel() == pc->GetLevel()
             && align_fcn_name.equals(align_root_name))
          {
             fcn_as.Add(pc);
-            align_cur->align.next = pc;
-            align_cur             = pc;
+            align_cur->AlignmentData().next = pc;
+            align_cur = pc;
             align_len++;
             add_str = "  Add";
          }
@@ -179,8 +179,8 @@ void align_same_func_call_params(void)
 
       if (add_str != nullptr)
       {
-         LOG_FMT(LASFCP, "%s(%d): %s with function '%s', on orig_line %zu, ",
-                 __func__, __LINE__, add_str, align_fcn_name.c_str(), pc->orig_line);
+         LOG_FMT(LASFCP, "%s(%d): %s with function '%s', on orig line %zu, ",
+                 __func__, __LINE__, add_str, align_fcn_name.c_str(), pc->GetOrigLine());
          align_params(pc, chunks);
          LOG_FMT(LASFCP, "%zu items:", chunks.size());
 
@@ -219,10 +219,10 @@ void align_same_func_call_params(void)
 
                if (!options::align_number_right())
                {
-                  if (  chunk_is_token(chunks[idx], CT_NUMBER_FP)
-                     || chunk_is_token(chunks[idx], CT_NUMBER)
-                     || chunk_is_token(chunks[idx], CT_POS)
-                     || chunk_is_token(chunks[idx], CT_NEG))
+                  if (  chunks[idx]->Is(CT_NUMBER_FP)
+                     || chunks[idx]->Is(CT_NUMBER)
+                     || chunks[idx]->Is(CT_POS)
+                     || chunks[idx]->Is(CT_NEG))
                   {
                      log_rule_B("align_on_tabstop");
                      array_of_AlignStack[idx].m_right_align = !options::align_on_tabstop();
@@ -255,26 +255,26 @@ void align_params(Chunk *start, deque<Chunk *> &chunks)
    chunks.clear();
 
    bool  hit_comma = true;
-   Chunk *pc       = start->GetNextType(CT_FPAREN_OPEN, start->level);
+   Chunk *pc       = start->GetNextType(CT_FPAREN_OPEN, start->GetLevel());
 
    while ((pc = pc->GetNext())->IsNotNullChunk())
    {
-      if (  chunk_is_newline(pc)
-         || chunk_is_token(pc, CT_SEMICOLON)
-         || (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-            && pc->level == start->level))
+      if (  pc->IsNewline()
+         || pc->Is(CT_SEMICOLON)
+         || (  pc->Is(CT_FPAREN_CLOSE)
+            && pc->GetLevel() == start->GetLevel()))
       {
          break;
       }
 
-      if (pc->level == (start->level + 1))
+      if (pc->GetLevel() == (start->GetLevel() + 1))
       {
          if (hit_comma)
          {
             chunks.push_back(pc);
             hit_comma = false;
          }
-         else if (chunk_is_token(pc, CT_COMMA))
+         else if (pc->Is(CT_COMMA))
          {
             hit_comma = true;
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.h
index 73420292..648d7174 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.h
@@ -17,6 +17,6 @@ using namespace std;
 
 void align_params(Chunk *start, deque<Chunk *> &chunks);
 
-void align_same_func_call_params(void);
+void align_same_func_call_params();
 
 #endif /* ALIGN_SAME_FUNC_CALL_PARAMS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.cpp
index e03ca3df..4ed5da0a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.cpp
@@ -89,8 +89,8 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
    //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",
-           __func__, __LINE__, start->Text(), start->orig_line, start->column, get_token_name(start->type), start->level);
+   LOG_FMT(LAS, "AlignStack::%s(%d): Candidate is '%s': orig line is %zu, column is %zu, type is %s, level is %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);
 
    // Assign a seqnum if needed
@@ -170,28 +170,22 @@ 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 = Chunk::NullChunkPtr;
+   Chunk *prev = start;
 
-   if (start != nullptr)
-   {
-      prev = start;
-   }
-
-   while (  (prev = prev->GetPrev()) != nullptr
-         && prev->IsNotNullChunk()
-         && (  chunk_is_ptr_operator(prev)
-            || chunk_is_token(prev, CT_TPAREN_OPEN)))
+   while (  (prev = prev->GetPrev())->IsNotNullChunk()
+         && (  prev->IsPointerOperator()
+            || prev->Is(CT_TPAREN_OPEN)))
    {
       // do nothing - we want prev when this exits
    }
 
-   if (prev == nullptr)
+   if (prev->IsNullChunk())
    {
       return;
    }
    Chunk *ref = prev;
 
-   if (chunk_is_newline(ref))
+   if (ref->IsNewline())
    {
       ref = ref->GetNext();
    }
@@ -209,13 +203,13 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
       Chunk *tmp_prev = ali->GetPrev();
 
       while (  tmp_prev->IsStar()
-            || chunk_is_msref(tmp_prev))
+            || tmp_prev->IsMsRef())
       {
          ali      = tmp_prev;
          tmp_prev = ali->GetPrev();
       }
 
-      if (chunk_is_token(tmp_prev, CT_TPAREN_OPEN))
+      if (tmp_prev->Is(CT_TPAREN_OPEN))
       {
          ali      = tmp_prev;
          tmp_prev = ali->GetPrev();
@@ -230,7 +224,7 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
       // back up to the first '&' preceding the token
       Chunk *tmp_prev = ali->GetPrev();
 
-      while (chunk_is_addr(tmp_prev))
+      while (tmp_prev->IsAddress())
       {
          ali      = tmp_prev;
          tmp_prev = ali->GetPrev();
@@ -241,7 +235,7 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
    // Tighten down the spacing between ref and start
    if (!options::align_keep_extra_space())
    {
-      size_t tmp_col = ref->column;
+      size_t tmp_col = ref->GetColumn();
       Chunk  *tmp    = ref;
       LOG_FMT(LAS, "AlignStack::%s(%d): tmp_col is %zu\n",
               __func__, __LINE__, tmp_col);
@@ -253,13 +247,13 @@ 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",
-                    __func__, __LINE__, next->orig_line, next->orig_col, next->Text(), next->level, get_token_name(next->type));
+            LOG_FMT(LAS, "AlignStack::%s(%d): next orig line is %zu, orig col is %zu, Text() '%s', level is %zu, type is %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",
-                    __func__, __LINE__, next->column, next->level, tmp_col);
+            LOG_FMT(LAS, "AlignStack::%s(%d): next column is %zu, level is %zu, tmp_col is %zu\n",
+                    __func__, __LINE__, next->GetColumn(), next->GetLevel(), tmp_col);
 
-            if (next->column != tmp_col)
+            if (next->GetColumn() != tmp_col)
             {
                LOG_FMT(LAS, "AlignStack::%s(%d): Call align_to_column\n", __func__, __LINE__);
                align_to_column(next, tmp_col);
@@ -272,9 +266,9 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
    // Check threshold limits
    if (  m_max_col == 0
       || m_thresh == 0
-      || (  ((start->column + m_gap) <= (m_thresh + (m_absolute_thresh ? m_min_col : m_max_col))) // don't use subtraction here to prevent underflow
-         && (  (start->column + m_gap + m_thresh) >= m_max_col                                    // change the expression to mind negative expression
-            || start->column >= m_min_col)))
+      || (  ((start->GetColumn() + m_gap) <= (m_thresh + (m_absolute_thresh ? m_min_col : m_max_col))) // don't use subtraction here to prevent underflow
+         && (  (start->GetColumn() + m_gap + m_thresh) >= m_max_col                                    // change the expression to mind negative expression
+            || start->GetColumn() >= m_min_col)))
    {
       // we are adding it, so update the newline seqnum
       if (seqnum > m_nl_seqnum)
@@ -287,50 +281,50 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
 
       if (ref != ali)
       {
-         gap = ali->column - (ref->column + ref->Len());
+         gap = ali->GetColumn() - (ref->GetColumn() + ref->Len());
       }
       Chunk *tmp = ali;
 
-      if (chunk_is_token(tmp, CT_TPAREN_OPEN))
+      if (tmp->Is(CT_TPAREN_OPEN))
       {
          tmp = tmp->GetNext();
       }
 
       if (  (  tmp->IsStar()
             && m_star_style == SS_DANGLE)
-         || (  chunk_is_addr(tmp)
+         || (  tmp->IsAddress()
             && m_amp_style == SS_DANGLE)
-         || (  chunk_is_nullable(tmp)
+         || (  tmp->IsNullable()
             && (m_star_style == SS_DANGLE))
-         || (  chunk_is_msref(tmp)
+         || (  tmp->IsMsRef()
             && m_star_style == SS_DANGLE))     // TODO: add m_msref_style
       {
-         col_adj = start->column - ali->column;
-         gap     = start->column - (ref->column + ref->Len());
+         col_adj = start->GetColumn() - ali->GetColumn();
+         gap     = start->GetColumn() - (ref->GetColumn() + ref->Len());
       }
       // See if this pushes out the max_col
-      const size_t endcol = ali->column + col_adj
+      const size_t endcol = ali->GetColumn() + col_adj
                             + (gap < m_gap ? m_gap - gap : 0);
 
-      ali->align.col_adj = col_adj;
-      ali->align.ref     = ref;
-      ali->align.start   = start;
+      ali->AlignmentData().col_adj = col_adj;
+      ali->AlignmentData().ref     = ref;
+      ali->AlignmentData().start   = start;
       m_aligned.Push_Back(ali, seqnum);
       m_last_added = 1;
 
       // Issue #2278
-      if (chunk_is_token(ali, CT_PTR_TYPE))
+      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",
-                 __func__, __LINE__, ali->Text(), start->Text(), ali->orig_line, ali->column, get_token_name(ali->type), ali->level);
+         LOG_FMT(LAS, "AlignStack::%s(%d): Add-[%s][%s]: ali orig line is %zu, column is %zu, type is %s, level is %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",
-                 __func__, __LINE__, ali->Text(), ali->orig_line, ali->column, get_token_name(ali->type), ali->level);
+         LOG_FMT(LAS, "AlignStack::%s(%d): Add-[%s]: ali orig line is %zu, column is %zu, type is %s, level is %zu\n",
+                 __func__, __LINE__, ali->Text(), ali->GetOrigLine(), ali->GetColumn(), get_token_name(ali->GetType()), ali->GetLevel());
       }
-      LOG_FMT(LAS, "AlignStack::%s(%d):    ali->align.col_adj is %d, ref '%s', endcol is %zu\n",
-              __func__, __LINE__, ali->align.col_adj, ref->Text(), endcol);
+      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);
 
       if (m_min_col > endcol)
       {
@@ -341,8 +335,8 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
       {
          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, ali->column is %zu, max_col old is %zu, new is %zu, m_min_col is %zu\n",
-                 __func__, __LINE__, ali->orig_line, ali->column, m_max_col, endcol, m_min_col);
+         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;
 
          /*
@@ -358,8 +352,8 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
       {
          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, ali->column is %zu, max_col old is %zu, new is %zu, m_min_col is %zu\n",
-                 __func__, __LINE__, ali->orig_line, ali->column, m_max_col, endcol, m_min_col);
+         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
@@ -370,7 +364,7 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
 
       LOG_FMT(LAS, "AlignStack::Add-skipped [%zu/%zu/%zu]: line %zu, col %zu <= %zu + %zu\n",
               seqnum, m_nl_seqnum, m_seqnum,
-              start->orig_line, start->column, m_max_col, m_thresh);
+              start->GetOrigLine(), start->GetColumn(), m_max_col, m_thresh);
    }
    // produces much more log output. Use it only debugging purpose
    //WITH_STACKID_DEBUG;
@@ -418,11 +412,11 @@ void AlignStack::Flush()
    {
       // check if we have *one* typedef in the line
       Chunk *pc   = m_aligned.Get(0)->m_pc;
-      Chunk *temp = pc->GetPrevType(CT_TYPEDEF, pc->level);
+      Chunk *temp = pc->GetPrevType(CT_TYPEDEF, pc->GetLevel());
 
       if (temp->IsNotNullChunk())
       {
-         if (pc->orig_line == temp->orig_line)
+         if (pc->GetOrigLine() == temp->GetOrigLine())
          {
             // reset the gap only for *this* stack
             m_gap = 1;
@@ -440,8 +434,8 @@ void AlignStack::Flush()
    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->align.col_adj is %d\n",
-              __func__, __LINE__, idx, pc->Text(), pc->align.col_adj);
+      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);
    }
 
    // Recalculate the max_col - it may have shifted since the last Add()
@@ -453,34 +447,34 @@ void AlignStack::Flush()
       size_t col_adj = 0;
       size_t gap     = 0;
 
-      if (pc != pc->align.ref)
+      if (pc != pc->GetAlignmentData().ref)
       {
-         gap = pc->column - (pc->align.ref->column + pc->align.ref->Len());
+         gap = pc->GetColumn() - (pc->GetAlignmentData().ref->GetColumn() + pc->GetAlignmentData().ref->Len());
       }
 
       if (m_star_style == SS_DANGLE)
       {
-         Chunk *tmp = (chunk_is_token(pc, CT_TPAREN_OPEN)) ? pc->GetNext() : pc;
+         Chunk *tmp = (pc->Is(CT_TPAREN_OPEN)) ? pc->GetNext() : pc;
 
-         if (chunk_is_ptr_operator(tmp))
+         if (tmp->IsPointerOperator())
          {
-            col_adj = pc->align.start->column - pc->column;
-            gap     = pc->align.start->column - (pc->align.ref->column + pc->align.ref->Len());
+            col_adj = pc->GetAlignmentData().start->GetColumn() - pc->GetColumn();
+            gap     = pc->GetAlignmentData().start->GetColumn() - (pc->GetAlignmentData().ref->GetColumn() + pc->GetAlignmentData().ref->Len());
          }
       }
 
       if (m_right_align)
       {
          // Adjust the width for signed numbers
-         if (pc->align.start != nullptr)
+         if (pc->GetAlignmentData().start != nullptr)
          {
-            size_t start_len = pc->align.start->Len();
+            size_t start_len = pc->GetAlignmentData().start->Len();
 
-            if (pc->align.start->type == CT_NEG)
+            if (pc->GetAlignmentData().start->GetType() == CT_NEG)
             {
-               Chunk *next = pc->align.start->GetNext();
+               Chunk *next = pc->GetAlignmentData().start->GetNext();
 
-               if (chunk_is_token(next, CT_NUMBER))
+               if (next->Is(CT_NUMBER))
                {
                   start_len += next->Len();
                }
@@ -488,10 +482,10 @@ void AlignStack::Flush()
             col_adj += start_len;
          }
       }
-      pc->align.col_adj = col_adj;
+      pc->AlignmentData().col_adj = col_adj;
 
       // See if this pushes out the max_col
-      const size_t endcol = pc->column + col_adj
+      const size_t endcol = pc->GetColumn() + col_adj
                             + (gap < m_gap ? m_gap - gap : 0);
 
       if (endcol > m_max_col)
@@ -515,8 +509,8 @@ void AlignStack::Flush()
    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, align.col_adj is %d\n",
-              __func__, __LINE__, idx, ce->m_pc->Text(), ce->m_pc->orig_line, ce->m_pc->orig_col, ce->m_pc->align.col_adj);
+      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);
    }
 
    for (size_t idx = 0; idx < Len(); idx++)
@@ -524,33 +518,33 @@ void AlignStack::Flush()
       ce = m_aligned.Get(idx);
       Chunk        *pc = ce->m_pc;
 
-      const size_t tmp_col = m_max_col - pc->align.col_adj;
+      const size_t tmp_col = m_max_col - pc->GetAlignmentData().col_adj;
 
       if (idx == 0)
       {
          if (  m_skip_first
-            && pc->column != tmp_col)
+            && pc->GetColumn() != tmp_col)
          {
-            LOG_FMT(LAS, "AlignStack::%s(%d): orig_line is %zu, orig_col is %zu, dropping first item due to skip_first\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
+            LOG_FMT(LAS, "AlignStack::%s(%d): orig line is %zu, orig col is %zu, dropping first item due to skip_first\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
             m_skip_first = false;
             m_aligned.Pop_Front();
             Flush();
             m_skip_first = true;
             return;
          }
-         chunk_flags_set(pc, PCF_ALIGN_START);
+         pc->SetFlagBits(PCF_ALIGN_START);
 
-         pc->align.right_align = m_right_align;
-         pc->align.amp_style   = m_amp_style;
-         pc->align.star_style  = m_star_style;
+         pc->AlignmentData().right_align = m_right_align;
+         pc->AlignmentData().amp_style   = m_amp_style;
+         pc->AlignmentData().star_style  = m_star_style;
       }
-      pc->align.gap  = m_gap;
-      pc->align.next = m_aligned.GetChunk(idx + 1);
+      pc->AlignmentData().gap  = m_gap;
+      pc->AlignmentData().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->orig_line, pc->orig_col, pc->Text(), tmp_col, pc->align.col_adj);
+      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);
       align_to_column(pc, tmp_col);
    }
 
@@ -635,15 +629,15 @@ void AlignStack::Debug()
       {
          Chunk *pc = m_aligned.Get(idx)->m_pc;
 
-         if (chunk_is_token(pc, CT_PTR_TYPE))
+         if (pc->Is(CT_PTR_TYPE))
          {
-            LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, [%s][%s]: orig_line is %zu, orig_col is %zu, type is %s, level is %zu, brace_level is %zu\n",
-                    __func__, __LINE__, idx, pc->Text(), pc->next->Text(), pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->level, pc->brace_level);
+            LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, [%s][%s]: orig line is %zu, orig col is %zu, type is %s, level is %zu, brace level is %zu\n",
+                    __func__, __LINE__, idx, pc->Text(), pc->GetNext()->Text(), pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()), pc->GetLevel(), pc->GetBraceLevel());
          }
          else
          {
-            LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, [%s]: orig_line is %zu, orig_col is %zu, type is %s, level is %zu, brace_level is %zu\n",
-                    __func__, __LINE__, idx, pc->Text(), pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->level, pc->brace_level);
+            LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, [%s]: orig line is %zu, orig col is %zu, type is %s, level is %zu, brace level is %zu\n",
+                    __func__, __LINE__, idx, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()), pc->GetLevel(), pc->GetBraceLevel());
          }
       }
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.h
index 0aeefd48..6d079fe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.h
@@ -38,7 +38,7 @@ public:
    StarStyle  m_star_style;
    StarStyle  m_amp_style;
    bool       m_skip_first; //! do not include the first item if it causes it to be indented
-   size_t     stackID;      //! for debugging purpose only
+   size_t     stackID;      //! for debugging purposes only
 
 
    AlignStack()
@@ -125,7 +125,7 @@ public:
    size_t Len();
 
 
-   //! for debuging purpose only
+   //! for debugging purpose only
    void Debug();
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.cpp
index 9085b9ac..ca032bc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.cpp
@@ -13,7 +13,7 @@
 #include "chunk.h"
 
 
-void align_struct_initializers(void)
+void align_struct_initializers()
 {
    LOG_FUNC_ENTRY();
    Chunk *pc = Chunk::GetHead();
@@ -22,13 +22,13 @@ void align_struct_initializers(void)
    {
       Chunk *prev = pc->GetPrevNcNnl();
 
-      if (  chunk_is_token(prev, CT_ASSIGN)
-         && (  chunk_is_token(pc, CT_BRACE_OPEN)
+      if (  prev->Is(CT_ASSIGN)
+         && (  pc->Is(CT_BRACE_OPEN)
             || (  language_is_set(LANG_D)
-               && chunk_is_token(pc, CT_SQUARE_OPEN))))
+               && pc->Is(CT_SQUARE_OPEN))))
       {
          align_init_brace(pc);
       }
-      pc = pc->GetNextType(CT_BRACE_OPEN, -1);
+      pc = pc->GetNextType(CT_BRACE_OPEN);
    }
 } // align_struct_initializers
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.h
index 1c71d5af..7310d072 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.h
@@ -13,6 +13,6 @@
 #include "uncrustify_types.h"
 
 //! Aligns stuff inside a multi-line "= { ... }" sequence.
-void align_struct_initializers(void);
+void align_struct_initializers();
 
 #endif /* ALIGN_STRUCT_INITIALIZERS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.cpp
index 8d91b0ff..8d91b0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.h
index 9e57baa0..9e57baa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.cpp
index 5cfd64e5..2a3bbc09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.cpp
@@ -15,17 +15,11 @@
 
 Chunk *skip_c99_array(Chunk *sq_open)
 {
-   if (chunk_is_token(sq_open, CT_SQUARE_OPEN))
+   if (sq_open->Is(CT_SQUARE_OPEN))
    {
-      Chunk *tmp = chunk_skip_to_match(sq_open);
+      Chunk *tmp = sq_open->GetClosingParen()->GetNextNc();
 
-      if (tmp == nullptr)
-      {
-         tmp = Chunk::NullChunkPtr;
-      }
-      tmp = tmp->GetNextNc();
-
-      if (chunk_is_token(tmp, CT_ASSIGN))
+      if (tmp->Is(CT_ASSIGN))
       {
          return(tmp->GetNextNc());
       }
@@ -34,9 +28,8 @@ Chunk *skip_c99_array(Chunk *sq_open)
 } // skip_c99_array
 
 
-Chunk *scan_ib_line(Chunk *start, bool first_pass)
+Chunk *scan_ib_line(Chunk *start)
 {
-   UNUSED(first_pass);
    LOG_FUNC_ENTRY();
    Chunk  *prev_match = nullptr;
    size_t idx         = 0;
@@ -46,7 +39,7 @@ Chunk *scan_ib_line(Chunk *start, bool first_pass)
 
    if (tmp != nullptr)
    {
-      set_chunk_parent(start, CT_TSQUARE);
+      start->SetParentType(CT_TSQUARE);
       start            = tmp;
       cpd.al_c99_array = true;
    }
@@ -54,8 +47,8 @@ Chunk *scan_ib_line(Chunk *start, bool first_pass)
 
    if (pc != nullptr)
    {
-      LOG_FMT(LSIB, "%s(%d): start: orig_line is %zu, orig_col is %zu, column is %zu, type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, get_token_name(pc->type));
+      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()));
    }
    else
    {
@@ -63,11 +56,11 @@ Chunk *scan_ib_line(Chunk *start, bool first_pass)
    }
 
    while (  pc->IsNotNullChunk()
-         && !chunk_is_newline(pc)
-         && pc->level >= start->level)
+         && !pc->IsNewline()
+         && pc->GetLevel() >= start->GetLevel())
    {
       //LOG_FMT(LSIB, "%s:     '%s'   col %d/%d line %zu\n", __func__,
-      //        pc->Text(), pc->column, pc->orig_col, pc->orig_line);
+      //        pc->Text(), pc->GetColumn(), pc->GetOrigCol(), pc->GetOrigLine());
 
       Chunk *next = pc->GetNext();
 
@@ -76,10 +69,10 @@ Chunk *scan_ib_line(Chunk *start, bool first_pass)
       {
          // do nothing
       }
-      else if (  chunk_is_token(pc, CT_ASSIGN)
-              || chunk_is_token(pc, CT_BRACE_OPEN)
-              || chunk_is_token(pc, CT_BRACE_CLOSE)
-              || chunk_is_token(pc, CT_COMMA))
+      else if (  pc->Is(CT_ASSIGN)
+              || pc->Is(CT_BRACE_OPEN)
+              || pc->Is(CT_BRACE_CLOSE)
+              || pc->Is(CT_COMMA))
       {
          size_t token_width = space_col_align(pc, next);
 
@@ -92,11 +85,12 @@ Chunk *scan_ib_line(Chunk *start, bool first_pass)
             {
                LOG_FMT(LSIB, "%s(%d): Prepare the 'idx's\n", __func__, __LINE__);
             }
-            LOG_FMT(LSIB, "%s(%d):   New idx is %2.1zu, pc->column is %2.1zu, Text() '%s', token_width is %zu, type is %s\n",
-                    __func__, __LINE__, idx, pc->column, pc->Text(), token_width, get_token_name(pc->type));
-            cpd.al[cpd.al_cnt].type = pc->type;
-            cpd.al[cpd.al_cnt].col  = pc->column;
+            LOG_FMT(LSIB, "%s(%d):   New idx is %2.1zu, pc->GetColumn() is %2.1zu, Text() '%s', token_width is %zu, type is %s\n",
+                    __func__, __LINE__, idx, pc->GetColumn(), pc->Text(), token_width, get_token_name(pc->GetType()));
+            cpd.al[cpd.al_cnt].type = pc->GetType();
+            cpd.al[cpd.al_cnt].col  = pc->GetColumn();
             cpd.al[cpd.al_cnt].len  = token_width;
+            cpd.al[cpd.al_cnt].ref  = pc;                  // Issue #3786
             cpd.al_cnt++;
 
             if (cpd.al_cnt == uncrustify::limits::AL_SIZE)
@@ -104,7 +98,7 @@ Chunk *scan_ib_line(Chunk *start, bool first_pass)
                fprintf(stderr, "Number of 'entry' to be aligned is too big for the current value %d,\n",
                        uncrustify::limits::AL_SIZE);
                fprintf(stderr, "at line %zu, column %zu.\n",
-                       pc->orig_line, pc->orig_col);
+                       pc->GetOrigLine(), pc->GetOrigCol());
                fprintf(stderr, "Please make a report.\n");
                log_flush(true);
                exit(EX_SOFTWARE);
@@ -114,34 +108,34 @@ Chunk *scan_ib_line(Chunk *start, bool first_pass)
          else
          {
             // expect to match stuff
-            if (cpd.al[idx].type == pc->type)
+            if (cpd.al[idx].type == pc->GetType())
             {
-               LOG_FMT(LSIB, "%s(%d):   Match? idx is %2.1zu, orig_line is %2.1zu, column is %2.1zu, token_width is %zu, type is %s\n",
-                       __func__, __LINE__, idx, pc->orig_line, pc->column, token_width, get_token_name(pc->type));
+               LOG_FMT(LSIB, "%s(%d):   Match? idx is %2.1zu, orig line is %2.1zu, column is %2.1zu, token_width is %zu, type is %s\n",
+                       __func__, __LINE__, idx, pc->GetOrigLine(), pc->GetColumn(), token_width, get_token_name(pc->GetType()));
 
                // Shift out based on column
                if (prev_match == nullptr)
                {
-                  if (pc->column > cpd.al[idx].col)
+                  if (pc->GetColumn() > cpd.al[idx].col)
                   {
-                     LOG_FMT(LSIB, "%s(%d): [ pc->column (%zu) > cpd.al[%zu].col(%zu) ] \n",
-                             __func__, __LINE__, pc->column, idx, cpd.al[idx].col);
+                     LOG_FMT(LSIB, "%s(%d): [ pc column (%zu) > cpd.al[%zu].col(%zu) ] \n",
+                             __func__, __LINE__, pc->GetColumn(), idx, cpd.al[idx].col);
 
-                     ib_shift_out(idx, pc->column - cpd.al[idx].col);
-                     cpd.al[idx].col = pc->column;
+                     ib_shift_out(idx, pc->GetColumn() - cpd.al[idx].col);
+                     cpd.al[idx].col = pc->GetColumn();
                   }
                }
                else if (idx > 0)
                {
-                  LOG_FMT(LSIB, "%s(%d):   prev_match '%s', prev_match->orig_line is %zu, prev_match->orig_col is %zu\n",
-                          __func__, __LINE__, prev_match->Text(), prev_match->orig_line, prev_match->orig_col);
-                  int min_col_diff = pc->column - prev_match->column;
+                  LOG_FMT(LSIB, "%s(%d): prev_match '%s', orig line is %zu, orig col is %zu\n",
+                          __func__, __LINE__, prev_match->Text(), prev_match->GetOrigLine(), prev_match->GetOrigCol());
+                  int min_col_diff = pc->GetColumn() - prev_match->GetColumn();
                   int cur_col_diff = cpd.al[idx].col - cpd.al[idx - 1].col;
 
                   if (cur_col_diff < min_col_diff)
                   {
-                     LOG_FMT(LSIB, "%s(%d):   pc->orig_line is %zu\n",
-                             __func__, __LINE__, pc->orig_line);
+                     LOG_FMT(LSIB, "%s(%d):   pc orig line is %zu\n",
+                             __func__, __LINE__, pc->GetOrigLine());
                      ib_shift_out(idx, min_col_diff - cur_col_diff);
                   }
                }
@@ -162,7 +156,23 @@ void ib_shift_out(size_t idx, size_t num)
 {
    while (idx < cpd.al_cnt)
    {
-      cpd.al[idx].col += num;
+      bool  is_empty = false;                  // Issue #3786
+      Chunk *tmp     = cpd.al[idx].ref;
+
+      if (tmp->Is(CT_BRACE_CLOSE))
+      {
+         Chunk *pre = tmp->GetPrev();
+
+         if (pre->Is(CT_COMMA))
+         {
+            is_empty = true;
+         }
+      }
+
+      if (!is_empty)
+      {
+         cpd.al[idx].col += num;
+      }
       idx++;
    }
 } // ib_shift_out
@@ -178,7 +188,7 @@ Chunk *step_back_over_member(Chunk *pc)
 
    // Skip over any class stuff: bool CFoo::bar()
    while (  tmp->IsNotNullChunk()
-         && chunk_is_token(tmp, CT_DC_MEMBER))
+         && tmp->Is(CT_DC_MEMBER))
    {
       pc  = tmp->GetPrevNcNnl();
       tmp = pc->GetPrevNcNnl();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.h
index fe059dd5..6153ba34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.h
@@ -39,7 +39,7 @@ Chunk *skip_c99_array(Chunk *sq_open);
  * We trigger on BRACE_OPEN, FPAREN_OPEN, ASSIGN, and COMMA.
  * We want to align the NEXT item.
  */
-Chunk *scan_ib_line(Chunk *start, bool first_pass);
+Chunk *scan_ib_line(Chunk *start);
 
 void ib_shift_out(size_t idx, size_t num);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.cpp
index 7da86018..777c3dee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.cpp
@@ -40,10 +40,10 @@ void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev)
       while ((pc = cs.Pop_Back()) != nullptr)
       {
          align_to_column(pc, col);
-         chunk_flags_set(pc, PCF_WAS_ALIGNED);
+         pc->SetFlagBits(PCF_WAS_ALIGNED);
 
          LOG_FMT(sev, "%s(%d): indented [%s] on line %zu to %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line, pc->column);
+                 __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetColumn());
       }
    }
    cs.Reset();
@@ -56,7 +56,7 @@ Chunk *align_trailing_comments(Chunk *start)
    size_t       min_col  = 0;
    size_t       min_orig = 0;
    Chunk        *pc      = start;
-   const size_t lvl      = start->brace_level;
+   const size_t lvl      = start->GetBraceLevel();
    size_t       nl_count = 0;
    ChunkStack   cs;
    size_t       col;
@@ -70,7 +70,7 @@ Chunk *align_trailing_comments(Chunk *start)
    comment_align_e cmt_type_start = get_comment_align_type(pc);
 
    LOG_FMT(LALADD, "%s(%d): start on line=%zu\n",
-           __func__, __LINE__, pc->orig_line);
+           __func__, __LINE__, pc->GetOrigLine());
 
    // Find the max column
    log_rule_B("align_right_cmt_span");
@@ -78,11 +78,11 @@ Chunk *align_trailing_comments(Chunk *start)
    while (  pc->IsNotNullChunk()
          && (nl_count < options::align_right_cmt_span()))
    {
-      if (  pc->flags.test(PCF_RIGHT_COMMENT)
-         && pc->column > 1)
+      if (  pc->TestFlags(PCF_RIGHT_COMMENT)
+         && pc->GetColumn() > 1)
       {
          if (  same_level
-            && pc->brace_level != lvl)
+            && pc->GetBraceLevel() != lvl)
          {
             pc = pc->GetPrev();
             break;
@@ -92,22 +92,22 @@ Chunk *align_trailing_comments(Chunk *start)
          if (cmt_type_cur == cmt_type_start)
          {
             LOG_FMT(LALADD, "%s(%d): line=%zu min_col=%zu pc->col=%zu pc->len=%zu %s\n",
-                    __func__, __LINE__, pc->orig_line, min_col, pc->column, pc->Len(),
-                    get_token_name(pc->type));
+                    __func__, __LINE__, pc->GetOrigLine(), min_col, pc->GetColumn(), pc->Len(),
+                    get_token_name(pc->GetType()));
 
             if (  min_orig == 0
-               || min_orig > pc->column)
+               || min_orig > pc->GetColumn())
             {
-               min_orig = pc->column;
+               min_orig = pc->GetColumn();
             }
             align_add(cs, pc, min_col); // (intended_col < col));
             nl_count = 0;
          }
       }
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         nl_count += pc->nl_count;
+         nl_count += pc->GetNlCount();
       }
       pc = pc->GetNext();
    }
@@ -157,15 +157,15 @@ comment_align_e get_comment_align_type(Chunk *cmt)
       && cmt != nullptr
       && ((prev = cmt->GetPrev())->IsNotNullChunk()))
    {
-      if (  chunk_is_token(prev, CT_PP_ENDIF)
-         || chunk_is_token(prev, CT_PP_ELSE)
-         || chunk_is_token(prev, CT_ELSE)
-         || chunk_is_token(prev, CT_BRACE_CLOSE))
+      if (  prev->Is(CT_PP_ENDIF)
+         || prev->Is(CT_PP_ELSE)
+         || prev->Is(CT_ELSE)
+         || prev->Is(CT_BRACE_CLOSE))
       {
          // TODO: make the magic 3 configurable
-         if ((cmt->column - (prev->column + prev->Len())) < 3)
+         if ((cmt->GetColumn() - (prev->GetColumn() + prev->Len())) < 3)
          {
-            cmt_type = (chunk_is_token(prev, CT_PP_ENDIF)) ? comment_align_e::ENDIF : comment_align_e::BRACE;
+            cmt_type = (prev->Is(CT_PP_ENDIF)) ? comment_align_e::ENDIF : comment_align_e::BRACE;
          }
       }
    }
@@ -173,49 +173,47 @@ comment_align_e get_comment_align_type(Chunk *cmt)
 } // get_comment_align_type
 
 
-void align_right_comments(void)
+void align_right_comments()
 {
    LOG_FUNC_ENTRY();
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (  chunk_is_token(pc, CT_COMMENT)
-         || chunk_is_token(pc, CT_COMMENT_CPP)
-         || chunk_is_token(pc, CT_COMMENT_MULTI))
+      if (  pc->Is(CT_COMMENT)
+         || pc->Is(CT_COMMENT_CPP)
+         || pc->Is(CT_COMMENT_MULTI))
       {
-         if (get_chunk_parent_type(pc) == CT_COMMENT_END)
+         if (pc->GetParentType() == CT_COMMENT_END)
          {
-            Chunk *prev = pc->GetPrev();
-
             log_rule_B("align_right_cmt_gap");
 
-            if (pc->orig_col < prev->orig_col_end + options::align_right_cmt_gap())
+            if (pc->GetOrigPrevSp() < options::align_right_cmt_gap())
             {
-               LOG_FMT(LALTC, "NOT changing END comment on line %zu (%zu <= %zu + %u)\n",
-                       pc->orig_line, pc->orig_col, prev->orig_col_end,
+               LOG_FMT(LALTC, "NOT changing END comment on line %zu (%zu < %u)\n",
+                       pc->GetOrigLine(), pc->GetOrigPrevSp(),
                        options::align_right_cmt_gap());
             }
             else
             {
                LOG_FMT(LALTC, "Changing END comment on line %zu into a RIGHT-comment\n",
-                       pc->orig_line);
-               chunk_flags_set(pc, PCF_RIGHT_COMMENT);
+                       pc->GetOrigLine());
+               pc->SetFlagBits(PCF_RIGHT_COMMENT);
             }
          }
 
          // Change certain WHOLE comments into RIGHT-alignable comments
-         if (get_chunk_parent_type(pc) == CT_COMMENT_WHOLE)
+         if (pc->GetParentType() == CT_COMMENT_WHOLE)
          {
             log_rule_B("input_tab_size");
-            size_t max_col = pc->column_indent + options::input_tab_size();
+            size_t max_col = pc->GetColumnIndent() + options::input_tab_size();
 
             // If the comment is further right than the brace level...
-            if (pc->column >= max_col)
+            if (pc->GetColumn() >= max_col)
             {
                LOG_FMT(LALTC, "Changing WHOLE comment on line %zu into a RIGHT-comment (col=%zu col_ind=%zu max_col=%zu)\n",
-                       pc->orig_line, pc->column, pc->column_indent, max_col);
+                       pc->GetOrigLine(), pc->GetColumn(), pc->GetColumnIndent(), max_col);
 
-               chunk_flags_set(pc, PCF_RIGHT_COMMENT);
+               pc->SetFlagBits(PCF_RIGHT_COMMENT);
             }
          }
       }
@@ -225,7 +223,7 @@ void align_right_comments(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (pc->flags.test(PCF_RIGHT_COMMENT))
+      if (pc->TestFlags(PCF_RIGHT_COMMENT))
       {
          pc = align_trailing_comments(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.h
index d85c07d0..4fec7b8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.h
@@ -41,6 +41,6 @@ comment_align_e get_comment_align_type(Chunk *cmt);
 
 void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev);
 
-void align_right_comments(void);
+void align_right_comments();
 
 #endif /* ALIGN_TRAILING_COMMENTS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.cpp
index 56fc30a0..b97d9ddf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.cpp
@@ -36,25 +36,25 @@ void align_typedefs(size_t span)
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         as.NewLines(pc->nl_count);
+         as.NewLines(pc->GetNlCount());
          c_typedef = Chunk::NullChunkPtr;
       }
       else if (c_typedef->IsNotNullChunk())
       {
-         if (pc->flags.test(PCF_ANCHOR))
+         if (pc->TestFlags(PCF_ANCHOR))
          {
             as.Add(pc);
             LOG_FMT(LALTD, "%s(%d): typedef @ %zu:%zu, tag '%s' @ %zu:%zu\n",
-                    __func__, __LINE__, c_typedef->orig_line, c_typedef->orig_col,
-                    pc->Text(), pc->orig_line, pc->orig_col);
+                    __func__, __LINE__, c_typedef->GetOrigLine(), c_typedef->GetOrigCol(),
+                    pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
             c_typedef = Chunk::NullChunkPtr;
          }
       }
       else
       {
-         if (chunk_is_token(pc, CT_TYPEDEF))
+         if (pc->Is(CT_TYPEDEF))
          {
             c_typedef = pc;
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.h
index 2902d0d2..2902d0d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.cpp
index adbc5daf..a8cc2563 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.cpp
@@ -32,8 +32,8 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
    size_t mygap    = 0;
 
    // Override the span, if this is a struct/union
-   if (  get_chunk_parent_type(start) == CT_STRUCT
-      || get_chunk_parent_type(start) == CT_UNION)
+   if (  start->GetParentType() == CT_STRUCT
+      || start->GetParentType() == CT_UNION)
    {
       log_rule_B("align_var_struct_span");
       myspan = options::align_var_struct_span();
@@ -42,7 +42,7 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
       log_rule_B("align_var_struct_gap");
       mygap = options::align_var_struct_gap();
    }
-   else if (get_chunk_parent_type(start) == CT_CLASS)
+   else if (start->GetParentType() == CT_CLASS)
    {
       log_rule_B("align_var_class_span");
       myspan = options::align_var_class_span();
@@ -61,18 +61,18 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
    // can't be any variable definitions in a "= {" block
    Chunk *prev = start->GetPrevNcNnl();
 
-   if (chunk_is_token(prev, CT_ASSIGN))
+   if (prev->Is(CT_ASSIGN))
    {
-      LOG_FMT(LAVDB, "%s(%d): start->Text() '%s', type is %s, on orig_line %zu (abort due to assign)\n",
-              __func__, __LINE__, start->Text(), get_token_name(start->type), start->orig_line);
+      LOG_FMT(LAVDB, "%s(%d): start->Text() '%s', type is %s, on orig line %zu (abort due to assign)\n",
+              __func__, __LINE__, start->Text(), get_token_name(start->GetType()), start->GetOrigLine());
 
-      Chunk *pc = start->GetNextType(CT_BRACE_CLOSE, start->level);
+      Chunk *pc = start->GetNextType(CT_BRACE_CLOSE, start->GetLevel());
       return(pc->GetNextNcNnl());
    }
    char copy[1000];
 
-   LOG_FMT(LAVDB, "%s(%d): start->Text() '%s', type is %s, on orig_line %zu\n",
-           __func__, __LINE__, start->ElidedText(copy), get_token_name(start->type), start->orig_line);
+   LOG_FMT(LAVDB, "%s(%d): start->Text() '%s', type is %s, on orig line %zu\n",
+           __func__, __LINE__, start->ElidedText(copy), get_token_name(start->GetType()), start->GetOrigLine());
 
    log_rule_B("align_var_def_inline");
    auto const align_mask =
@@ -113,54 +113,55 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
    log_rule_B("align_mix_var_proto");
    bool  fp_active = options::align_mix_var_proto();
    Chunk *pc       = start->GetNext();
+   LOG_FMT(LAVDB, "%s(%d): start->Text() is '%s', level is %zu, brace level is %zu\n",
+           __func__, __LINE__, start->IsNewline() ? "Newline" : start->Text(), start->GetLevel(), start->GetBraceLevel());
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk()
-         && (  pc->level >= start->level
-            || pc->level == 0))
+   while (pc->IsNotNullChunk())
    {
-      if (chunk_is_newline(pc))
-      {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-      }
-      else
+      LOG_CHUNK(LAVDB, pc);
+
+      if (  pc->GetLevel() < start->GetLevel()
+         && pc->GetLevel() != 0
+         && !pc->IsPreproc())
       {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         LOG_FMT(LAVDB, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s, PRE is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()), pc->IsPreproc() ? "true" : "false");
+         break;
       }
 
       if (pc->IsComment())
       {
-         if (pc->nl_count > 0)
+         if (pc->GetNlCount() > 0)
          {
-            as.NewLines(pc->nl_count);
-            as_bc.NewLines(pc->nl_count);
-            as_at.NewLines(pc->nl_count);
-            as_br.NewLines(pc->nl_count);
+            as.NewLines(pc->GetNlCount());
+            as_bc.NewLines(pc->GetNlCount());
+            as_at.NewLines(pc->GetNlCount());
+            as_br.NewLines(pc->GetNlCount());
          }
          pc = pc->GetNext();
+         LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, brace level is %zu\n",
+                 __func__, __LINE__, pc->IsNewline() ? "Newline" : pc->Text(), pc->GetLevel(), pc->GetBraceLevel());
          continue;
       }
 
       if (  fp_active
-         && !pc->flags.test(PCF_IN_CLASS_BASE))
+         && !pc->TestFlags(PCF_IN_CLASS_BASE))
       {
          // WARNING: Duplicate from the align_func_proto()
          log_rule_B("align_single_line_func");
 
-         if (  chunk_is_token(pc, CT_FUNC_PROTO)
-            || (  chunk_is_token(pc, CT_FUNC_DEF)
+         if (  pc->Is(CT_FUNC_PROTO)
+            || (  pc->Is(CT_FUNC_DEF)
                && options::align_single_line_func()))
          {
-            LOG_FMT(LAVDB, "%s(%d): add = '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->level);
+            LOG_FMT(LAVDB, "%s(%d): add = '%s', orig line is %zu, orig col is %zu, level is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
 
             Chunk *toadd;
 
             log_rule_B("align_on_operator");
 
-            if (  get_chunk_parent_type(pc) == CT_OPERATOR
+            if (  pc->GetParentType() == CT_OPERATOR
                && options::align_on_operator())
             {
                toadd = pc->GetPrevNcNnl();
@@ -171,12 +172,12 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
             }
             as.Add(step_back_over_member(toadd));
             log_rule_B("align_single_line_brace");
-            fp_look_bro = (chunk_is_token(pc, CT_FUNC_DEF))
+            fp_look_bro = (pc->Is(CT_FUNC_DEF))
                           && options::align_single_line_brace();
          }
          else if (  fp_look_bro
-                 && chunk_is_token(pc, CT_BRACE_OPEN)
-                 && pc->flags.test(PCF_ONE_LINER))
+                 && pc->Is(CT_BRACE_OPEN)
+                 && pc->TestFlags(PCF_ONE_LINER))
          {
             as_br.Add(pc);
             fp_look_bro = false;
@@ -184,7 +185,7 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
       }
 
       // process nested braces
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
+      if (pc->Is(CT_BRACE_OPEN))
       {
          size_t sub_nl_count = 0;
 
@@ -208,88 +209,93 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
       }
 
       // Done with this brace set?
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
+      if (pc->Is(CT_BRACE_CLOSE))
       {
          pc = pc->GetNext();
+         LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, brace level is %zu\n",
+                 __func__, __LINE__, pc->IsNewline() ? "Newline" : pc->Text(), pc->GetLevel(), pc->GetBraceLevel());
          break;
       }
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          fp_look_bro   = false;
          did_this_line = false;
-         as.NewLines(pc->nl_count);
-         as_bc.NewLines(pc->nl_count);
-         as_at.NewLines(pc->nl_count);
-         as_br.NewLines(pc->nl_count);
+         as.NewLines(pc->GetNlCount());
+         as_bc.NewLines(pc->GetNlCount());
+         as_at.NewLines(pc->GetNlCount());
+         as_br.NewLines(pc->GetNlCount());
 
          if (p_nl_count != nullptr)
          {
-            *p_nl_count += pc->nl_count;
+            *p_nl_count += pc->GetNlCount();
          }
       }
-      LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, pc->brace_level is %zu\n",
-              __func__, __LINE__, chunk_is_newline(pc) ? "Newline" : pc->Text(), pc->level, pc->brace_level);
+      LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, brace level is %zu\n",
+              __func__, __LINE__, pc->IsNewline() ? "Newline" : pc->Text(), pc->GetLevel(), pc->GetBraceLevel());
 
-      if (!chunk_is_newline(pc))
+      if (!pc->IsNewline())
       {
-         LOG_FMT(LAVDB, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         LOG_FMT(LAVDB, "%s(%d): pc orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
 
-         if (chunk_is_not_token(pc, CT_IGNORED))
+         if (pc->IsNot(CT_IGNORED))
          {
             LOG_FMT(LAVDB, "   ");
-            log_pcf_flags(LAVDB, pc->flags);
+            log_pcf_flags(LAVDB, pc->GetFlags());
          }
       }
 
       // don't align stuff inside parenthesis/squares/angles
-      if (pc->level > pc->brace_level)
+      if (pc->GetLevel() > pc->GetBraceLevel())
       {
          pc = pc->GetNext();
+         LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, brace level is %zu\n",
+                 __func__, __LINE__, pc->IsNewline() ? "Newline" : pc->Text(), pc->GetLevel(), pc->GetBraceLevel());
          continue;
       }
 
       // If this is a variable def, update the max_col
-      if (  !pc->flags.test(PCF_IN_CLASS_BASE)
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_DEF)
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_PROTO)
-         && ((pc->flags & align_mask) == PCF_VAR_1ST)
-         && chunk_is_not_token(pc, CT_FUNC_DEF)                                   // Issue 1452
-         && (  (pc->level == (start->level + 1))
-            || pc->level == 0)
-         && pc->prev != nullptr
-         && pc->prev->type != CT_MEMBER)
+      if (  !pc->TestFlags(PCF_IN_CLASS_BASE)
+         && pc->IsNot(CT_FUNC_CLASS_DEF)
+         && pc->IsNot(CT_FUNC_CLASS_PROTO)
+         && ((pc->GetFlags() & align_mask) == PCF_VAR_1ST)
+         && pc->IsNot(CT_FUNC_DEF)                                   // Issue 1452
+         && (  (pc->GetLevel() == (start->GetLevel() + 1))
+            || pc->GetLevel() == 0)
+         && pc->GetPrev()->IsNot(CT_MEMBER))
       {
          LOG_FMT(LAVDB, "%s(%d): a-did_this_line is %s\n",
                  __func__, __LINE__, did_this_line ? "TRUE" : "FALSE");
-         LOG_FMT(LAVDB, "%s(%d): Text() is '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->level);
+         LOG_FMT(LAVDB, "%s(%d): Text() is '%s', orig line is %zu, orig col is %zu, level is %zu\n",
+                 __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
 
          if (!did_this_line)
          {
-            if (  get_chunk_parent_type(start) == CT_STRUCT
+            if (  start->GetParentType() == CT_STRUCT
                && (as.m_star_style == AlignStack::SS_INCLUDE))
             {
                // we must look after the previous token
-               Chunk *prev_local = pc->prev;
+               Chunk *prev_local = pc->GetPrev();
 
-               while (  chunk_is_token(prev_local, CT_PTR_TYPE)
-                     || chunk_is_token(prev_local, CT_ADDR))
+               while (  prev_local->Is(CT_PTR_TYPE)
+                     || prev_local->Is(CT_ADDR))
                {
-                  LOG_FMT(LAVDB, "%s(%d): prev_local '%s', prev_local->type %s\n",
-                          __func__, __LINE__, prev_local->Text(), get_token_name(prev_local->type));
-                  prev_local = prev_local->prev;
+                  LOG_FMT(LAVDB, "%s(%d): prev_local '%s', prev_local->GetType() %s\n",
+                          __func__, __LINE__, prev_local->Text(), get_token_name(prev_local->GetType()));
+                  prev_local = prev_local->GetPrev();
                }
-               pc = prev_local->next;
+               pc = prev_local->GetNext();
+               LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, brace level is %zu\n",
+                       __func__, __LINE__, pc->IsNewline() ? "Newline" : pc->Text(), pc->GetLevel(), pc->GetBraceLevel());
             }
             // we must look after the previous token
-            Chunk *prev_local = pc->prev;
+            Chunk *prev_local = pc->GetPrev();
 
-            if (chunk_is_not_token(prev_local, CT_DEREF))                    // Issue #2971
+            if (prev_local->IsNot(CT_DEREF))                    // Issue #2971
             {
-               LOG_FMT(LAVDB, "%s(%d): add = '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->level);
+               LOG_FMT(LAVDB, "%s(%d): add = '%s', orig line is %zu, orig col is %zu, level is %zu\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
 
                as.Add(step_back_over_member(pc));
             }
@@ -298,8 +304,10 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
             if (options::align_var_def_colon())
             {
                next = pc->GetNextNc();
+               LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, brace level is %zu\n",
+                       __func__, __LINE__, pc->IsNewline() ? "Newline" : pc->Text(), pc->GetLevel(), pc->GetBraceLevel());
 
-               if (chunk_is_token(next, CT_BIT_COLON))
+               if (next->Is(CT_BIT_COLON))
                {
                   as_bc.Add(next);
                }
@@ -312,14 +320,14 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
 
                while ((next = next->GetNextNc())->IsNotNullChunk())
                {
-                  if (chunk_is_token(next, CT_ATTRIBUTE))
+                  if (next->Is(CT_ATTRIBUTE))
                   {
                      as_at.Add(next);
                      break;
                   }
 
-                  if (  chunk_is_token(next, CT_SEMICOLON)
-                     || chunk_is_newline(next))
+                  if (  next->Is(CT_SEMICOLON)
+                     || next->IsNewline())
                   {
                      break;
                   }
@@ -328,7 +336,7 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
          }
          did_this_line = true;
       }
-      else if (chunk_is_token(pc, CT_BIT_COLON))
+      else if (pc->Is(CT_BIT_COLON))
       {
          if (!did_this_line)
          {
@@ -342,6 +350,8 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
                  __func__, __LINE__, did_this_line ? "TRUE" : "FALSE");
       }
       pc = pc->GetNext();
+      LOG_FMT(LAVDB, "%s(%d): pc->Text() is '%s', level is %zu, brace level is %zu\n",
+              __func__, __LINE__, pc->IsNewline() ? "Newline" : pc->Text(), pc->GetLevel(), pc->GetBraceLevel());
    }
    as.End();
    as_bc.End();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.h
index 6d06adf9..6d06adf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.cpp
index a03bbe00..a03bbe00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.h
index 712fbd59..712fbd59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.cpp
index e85ecf97..93a19c6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.cpp
@@ -105,13 +105,13 @@ int backup_copy_file(const char *filename, const vector<UINT8> &data)
       }
       LOG_FMT(LERR, "fwrite(%s) failed: %s (%d)\n",
               newpath, strerror(my_errno), my_errno);
-      cpd.error_count++;
+      exit(EX_SOFTWARE);
    }
    else
    {
       LOG_FMT(LERR, "fopen(%s) failed: %s (%d)\n",
               newpath, strerror(errno), errno);
-      cpd.error_count++;
+      exit(EX_SOFTWARE);
    }
    return(EX_IOERR);
 } // backup_copy_file
@@ -134,8 +134,7 @@ void backup_create_md5_file(const char *filename)
    {
       LOG_FMT(LERR, "%s: fopen(%s) failed: %s (%d)\n",
               __func__, filename, strerror(errno), errno);
-      cpd.error_count++;
-      return;
+      exit(EX_SOFTWARE);
    }
 
    // read file chunk by chunk and calculate its MD5 checksum
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.h
index 3e51f863..0d385649 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.h
@@ -21,6 +21,9 @@
 #ifndef BACKUP_H_INCLUDED
 #define BACKUP_H_INCLUDED
 
+#include "base_types.h"
+#include <vector>
+
 #define UNC_BACKUP_SUFFIX        ".unc-backup~"
 #define UNC_BACKUP_MD5_SUFFIX    ".unc-backup.md5~"
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/base_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/base_types.h
index 1e98b0ac..1e98b0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/base_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/base_types.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.cpp
index 5462b480..2cfe2ac2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.cpp
@@ -126,7 +126,7 @@ static size_t preproc_start(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       return(pp_level);
    }
    // Get the type of preprocessor and handle it
-   braceState.in_preproc = next->type;
+   braceState.in_preproc = next->GetType();
 
    // If we are not in a define, check for #if, #else, #endif, etc
    if (braceState.in_preproc != CT_PP_DEFINE)
@@ -179,7 +179,7 @@ static void print_stack(log_sev_t logsev, const char *str,
 
 
 //TODO: This can be cleaned up and simplified - we can look both forward and backward!
-void brace_cleanup(void)
+void brace_cleanup()
 {
    LOG_FUNC_ENTRY();
 
@@ -189,12 +189,11 @@ void brace_cleanup(void)
 
    while (pc->IsNotNullChunk())
    {
-      LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+      LOG_CHUNK(LTOK, pc);
 
       // Check for leaving a #define body
       if (  braceState.in_preproc != CT_NONE
-         && !pc->flags.test(PCF_IN_PREPROC))
+         && !pc->TestFlags(PCF_IN_PREPROC))
       {
          if (braceState.in_preproc == CT_PP_DEFINE)
          {
@@ -204,8 +203,8 @@ void brace_cleanup(void)
             if (  options::pp_warn_unbalanced_if()
                && brace_level != 1)
             {
-               LOG_FMT(LWARN, "%s(%d): orig_line is %zu, unbalanced #define block braces, out-level is %zu\n",
-                       __func__, __LINE__, pc->orig_line, brace_level);
+               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);
          }
@@ -214,7 +213,7 @@ void brace_cleanup(void)
       // Check for a preprocessor start
       size_t pp_level;
 
-      if (chunk_is_token(pc, CT_PREPROC))
+      if (pc->Is(CT_PREPROC))
       {
          pp_level = preproc_start(braceState, frm, pc);
       }
@@ -222,13 +221,13 @@ void brace_cleanup(void)
       {
          pp_level = braceState.pp_level;
       }
-      LOG_FMT(LTOK, "%s(%d): pp_level is %zu\n",
+      LOG_FMT(LTOK, "%s(%d): pp level is %zu\n",
               __func__, __LINE__, pp_level);
 
       // Do before assigning stuff from the frame
       if (  language_is_set(LANG_PAWN)
          && frm.top().type == CT_VBRACE_OPEN
-         && chunk_is_token(pc, CT_NEWLINE))
+         && pc->Is(CT_NEWLINE))
       {
          pc = pawn_check_vsemicolon(pc);
 
@@ -239,82 +238,31 @@ void brace_cleanup(void)
       }
 
       // Issue #1813
-      if (chunk_is_token(pc, CT_NAMESPACE))
+      if (pc->Is(CT_NAMESPACE))
       {
          mark_namespace(pc);
       }
       // Assume the level won't change
-      pc->level       = frm.level;
-      pc->brace_level = frm.brace_level;
-      pc->pp_level    = pp_level;
+      pc->SetLevel(frm.level);
+      pc->SetBraceLevel(frm.brace_level);
+      pc->SetPpLevel(pp_level);
 
       /*
        * #define bodies get the full formatting treatment
        * Also need to pass in the initial '#' to close out any virtual braces.
        */
-      if (  !pc->IsComment()
-         && !chunk_is_newline(pc)
-         && !chunk_is_token(pc, CT_ATTRIBUTE)
-         && !chunk_is_token(pc, CT_IGNORED)            // Issue #2279
+      if (  !pc->IsCommentOrNewline()
+         && !pc->Is(CT_ATTRIBUTE)
+         && !pc->Is(CT_IGNORED)            // Issue #2279
          && (  braceState.in_preproc == CT_PP_DEFINE
             || braceState.in_preproc == CT_NONE))
       {
          braceState.consumed = false;
          parse_cleanup(braceState, frm, pc);
-         print_stack(LBCSAFTER, (chunk_is_token(pc, CT_VBRACE_CLOSE)) ? "Virt-}\n" : pc->str.c_str(), frm);
+         print_stack(LBCSAFTER, (pc->Is(CT_VBRACE_CLOSE)) ? "Virt-}\n" : pc->GetStr().c_str(), frm);
       }
       pc = pc->GetNext();
    }
-//   pc = Chunk::GetHead();
-//
-//   while (pc->IsNotNullChunk())
-//   {
-//      LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-//              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-//
-//      // look for template
-//      if (chunk_is_token(pc, CT_TEMPLATE))                 // Issue #3309
-//      {
-//         Chunk *template_end = pc->GetNextType(CT_SEMICOLON, pc->level);
-//
-//         // look for a parameter pack
-//         while (pc->IsNotNullChunk())
-//         {
-//            LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-//                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-//
-//            if (chunk_is_token(pc, CT_PARAMETER_PACK))
-//            {
-//               Chunk *parameter_pack = pc;
-//
-//               // look for a token with the same text
-//               while (pc->IsNotNullChunk())
-//               {
-//                  LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-//                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-//                  pc = pc->GetNext();
-//
-//                  if (pc == template_end)
-//                  {
-//                     break;
-//                  }
-//
-//                  if (strcmp(pc->Text(), parameter_pack->Text()) == 0)
-//                  {
-//                     set_chunk_type(pc, CT_PARAMETER_PACK);
-//                  }
-//               }
-//            }
-//            pc = pc->GetNext();
-//
-//            if (pc == template_end)
-//            {
-//               break;
-//            }
-//         }
-//      }
-//      pc = pc->GetNext();
-//   }
 } // brace_cleanup
 
 
@@ -325,21 +273,21 @@ static bool maybe_while_of_do(Chunk *pc)
    Chunk *prev = pc->GetPrevNcNnl();
 
    if (  prev->IsNullChunk()
-      || !prev->flags.test(PCF_IN_PREPROC))
+      || !prev->TestFlags(PCF_IN_PREPROC))
    {
       return(false);
    }
 
    // Find the chunk before the preprocessor
    while (  prev->IsNullChunk()
-         && prev->flags.test(PCF_IN_PREPROC))
+         && prev->TestFlags(PCF_IN_PREPROC))
    {
       prev = prev->GetPrevNcNnl();
    }
 
-   if (  (  chunk_is_token(prev, CT_VBRACE_CLOSE)
-         || chunk_is_token(prev, CT_BRACE_CLOSE))
-      && get_chunk_parent_type(prev) == CT_DO)
+   if (  (  prev->Is(CT_VBRACE_CLOSE)
+         || prev->Is(CT_BRACE_CLOSE))
+      && prev->GetParentType() == CT_DO)
    {
       return(true);
    }
@@ -405,30 +353,30 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &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->orig_line, pc->orig_col, get_token_name(pc->type),
+   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));
-   log_pcf_flags(LTOK, pc->flags);
+   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->orig_line, get_token_name(pc->type), pc->Text());
+   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);
 
    if (  (  frm.stmt_count == 0
          || frm.expr_count == 0)
-      && !chunk_is_semicolon(pc)
-      && chunk_is_not_token(pc, CT_BRACE_CLOSE)
-      && chunk_is_not_token(pc, CT_VBRACE_CLOSE)
-      && !chunk_is_str(pc, ")")
-      && !chunk_is_str(pc, "]"))
+      && !pc->IsSemicolon()
+      && pc->IsNot(CT_BRACE_CLOSE)
+      && pc->IsNot(CT_VBRACE_CLOSE)
+      && !pc->IsString(")")
+      && !pc->IsString("]"))
    {
-      chunk_flags_set(pc, 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",
-              __func__, __LINE__, pc->orig_line, pc->Text(),
-              pc->flags.test(PCF_STMT_START) ? "stmt" : "expr", frm.stmt_count,
+      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",
+              __func__, __LINE__, pc->GetOrigLine(), pc->Text(),
+              pc->TestFlags(PCF_STMT_START) ? "stmt" : "expr", frm.stmt_count,
               frm.expr_count);
    }
    frm.stmt_count++;
@@ -438,30 +386,30 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
 
    if (frm.sparen_count > 0)
    {
-      chunk_flags_set(pc, PCF_IN_SPAREN);
+      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)
          {
-            chunk_flags_set(pc, PCF_IN_FOR);
+            pc->SetFlagBits(PCF_IN_FOR);
             break;
          }
       }
 
       // Mark the parent on semicolons in for() statements
-      if (  chunk_is_token(pc, CT_SEMICOLON)
+      if (  pc->Is(CT_SEMICOLON)
          && frm.size() > 2
          && frm.prev().type == CT_FOR)
       {
-         set_chunk_parent(pc, CT_FOR);
+         pc->SetParentType(CT_FOR);
       }
    }
 
    // Check the progression of complex statements
    if (  frm.top().stage != brace_stage_e::NONE
-      && !chunk_is_token(pc, CT_AUTORELEASEPOOL)
+      && !pc->Is(CT_AUTORELEASEPOOL)
       && check_complex_statements(frm, pc, braceState))
    {
       return;
@@ -475,57 +423,57 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
     */
    if (frm.top().type == CT_VBRACE_OPEN)
    {
-      if (chunk_is_semicolon(pc))
+      if (pc->IsSemicolon())
       {
          braceState.consumed = true;
          close_statement(frm, pc, braceState);
       }
       else if (  language_is_set(LANG_PAWN)
-              && chunk_is_token(pc, CT_BRACE_CLOSE))
+              && pc->Is(CT_BRACE_CLOSE))
       {
          close_statement(frm, pc, braceState);
       }
       else if (  language_is_set(LANG_D)
-              && chunk_is_token(pc, CT_BRACE_CLOSE))
+              && pc->Is(CT_BRACE_CLOSE))
       {
          close_statement(frm, pc, braceState);
       }
    }
 
    // Handle close parenthesis, vbrace, brace, and square
-   if (  chunk_is_token(pc, CT_PAREN_CLOSE)
-      || chunk_is_token(pc, CT_BRACE_CLOSE)
-      || chunk_is_token(pc, CT_VBRACE_CLOSE)
-      || chunk_is_token(pc, CT_ANGLE_CLOSE)
-      || chunk_is_token(pc, CT_MACRO_CLOSE)
-      || chunk_is_token(pc, CT_SQUARE_CLOSE))
+   if (  pc->Is(CT_PAREN_CLOSE)
+      || pc->Is(CT_BRACE_CLOSE)
+      || pc->Is(CT_VBRACE_CLOSE)
+      || pc->Is(CT_ANGLE_CLOSE)
+      || pc->Is(CT_MACRO_CLOSE)
+      || pc->Is(CT_SQUARE_CLOSE))
    {
       // Change CT_PAREN_CLOSE into CT_SPAREN_CLOSE or CT_FPAREN_CLOSE
-      if (  chunk_is_token(pc, CT_PAREN_CLOSE)
+      if (  pc->Is(CT_PAREN_CLOSE)
          && (  (frm.top().type == CT_FPAREN_OPEN)
             || (frm.top().type == CT_SPAREN_OPEN)))
       {
          // TODO: fix enum hack
-         set_chunk_type(pc, static_cast<E_Token>(frm.top().type + 1));
+         pc->SetType(static_cast<E_Token>(frm.top().type + 1));
 
-         if (chunk_is_token(pc, CT_SPAREN_CLOSE))
+         if (pc->Is(CT_SPAREN_CLOSE))
          {
             frm.sparen_count--;
-            chunk_flags_clr(pc, PCF_IN_SPAREN);
+            pc->ResetFlagBits(PCF_IN_SPAREN);
          }
       }
 
       // Make sure the open / close match
-      if (chunk_is_not_token(pc, (E_Token)(frm.top().type + 1)))
+      if (pc->IsNot((E_Token)(frm.top().type + 1)))
       {
-         if (pc->flags.test(PCF_IN_PREPROC))                // Issue #3113, #3283
+         if (pc->TestFlags(PCF_IN_PREPROC))                // Issue #3113, #3283
          {
             // do nothing
          }
          else
          {
-            LOG_FMT(LWARN, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            LOG_FMT(LWARN, "%s(%d): 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
 
             if (AA.type != CT_EOF)
@@ -537,12 +485,11 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
             if (  frm.top().type != CT_EOF
                && frm.top().type != CT_PP_DEFINE)
             {
-               LOG_FMT(LWARN, "%s(%d): File: %s, orig_line is %zu, orig_col is %zu, Error: Unexpected '%s' for '%s', which was on line %zu\n",
-                       __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, pc->orig_col,
-                       pc->Text(), get_token_name(frm.top().pc->type),
-                       frm.top().pc->orig_line);
+               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());
                print_stack(LBCSPOP, "=Error  ", frm);
-               cpd.error_count++;
                exit(EXIT_FAILURE);
             }
          }
@@ -552,32 +499,32 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          braceState.consumed = true;
 
          // Copy the parent, update the parenthesis/brace levels
-         set_chunk_parent(pc, frm.top().parent);
+         pc->SetParentType(frm.top().parent);
          frm.level--;
 
-         if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            || chunk_is_token(pc, CT_VBRACE_CLOSE)
-            || chunk_is_token(pc, CT_MACRO_CLOSE))
+         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);
-            log_pcf_flags(LBCSPOP, pc->flags);
+            log_pcf_flags(LBCSPOP, pc->GetFlags());
          }
-         pc->level       = frm.level;
-         pc->brace_level = frm.brace_level;
+         pc->SetLevel(frm.level);
+         pc->SetBraceLevel(frm.brace_level);
 
          // Pop the entry
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         LOG_FMT(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);
          print_stack(LBCSPOP, "-Close  ", frm);
 
          if (  frm.top().stage == brace_stage_e::NONE
-            && (  chunk_is_token(pc, CT_VBRACE_CLOSE)
-               || chunk_is_token(pc, CT_BRACE_CLOSE)
-               || chunk_is_token(pc, CT_SEMICOLON))
-            && chunk_is_token(frm.top().pc, CT_VBRACE_OPEN))
+            && (  pc->Is(CT_VBRACE_CLOSE)
+               || pc->Is(CT_BRACE_CLOSE)
+               || pc->Is(CT_SEMICOLON))
+            && frm.top().pc->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
@@ -597,7 +544,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
    /*
     * In this state, we expect a semicolon, but we'll also hit the closing
     * sparen, so we need to check braceState.consumed to see if the close sparen
-    * was aleady handled.
+    * was already handled.
     */
    if (frm.top().stage == brace_stage_e::WOD_SEMI)
    {
@@ -612,8 +559,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          {
             Chunk *tmp = pc->GetNextNcNnl();
 
-            if (  chunk_is_not_token(tmp, CT_SEMICOLON)
-               && chunk_is_not_token(tmp, CT_VSEMICOLON))
+            if (!tmp->IsSemicolon())
             {
                pawn_add_vsemi_after(pc);
             }
@@ -622,74 +568,73 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       else
       {
          // Complain if this ISN'T a semicolon, but close out WHILE_OF_DO anyway
-         if (  chunk_is_token(pc, CT_SEMICOLON)
-            || chunk_is_token(pc, CT_VSEMICOLON))
+         if (pc->IsSemicolon())
          {
             braceState.consumed = true;
-            set_chunk_parent(pc, CT_WHILE_OF_DO);
+            pc->SetParentType(CT_WHILE_OF_DO);
          }
          else
          {
             LOG_FMT(LWARN, "%s: %s(%d): %zu: Error: Expected a semicolon for WHILE_OF_DO, but got '%s'\n",
-                    cpd.filename.c_str(), __func__, __LINE__, pc->orig_line,
-                    get_token_name(pc->type));
-            cpd.error_count++;
+                    cpd.filename.c_str(), __func__, __LINE__, pc->GetOrigLine(),
+                    get_token_name(pc->GetType()));
+            exit(EX_SOFTWARE);
          }
          handle_complex_close(frm, pc, braceState);
       }
    }
    // Get the parent type for brace and parenthesis open
-   E_Token parent = get_chunk_parent_type(pc);
+   E_Token parentType = pc->GetParentType();
 
-   if (  chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_SPAREN_OPEN)
-      || chunk_is_token(pc, CT_BRACE_OPEN))
+   if (  pc->Is(CT_PAREN_OPEN)
+      || pc->Is(CT_FPAREN_OPEN)
+      || pc->Is(CT_SPAREN_OPEN)
+      || pc->Is(CT_BRACE_OPEN))
    {
       Chunk *prev = pc->GetPrevNcNnl();
 
       if (prev->IsNotNullChunk())
       {
-         if (  chunk_is_token(pc, CT_PAREN_OPEN)
-            || chunk_is_token(pc, CT_FPAREN_OPEN)
-            || chunk_is_token(pc, CT_SPAREN_OPEN))
+         if (  pc->Is(CT_PAREN_OPEN)
+            || pc->Is(CT_FPAREN_OPEN)
+            || pc->Is(CT_SPAREN_OPEN))
          {
             // Set the parent for parenthesis and change parenthesis type
-            if (  chunk_is_token(prev, CT_IF)
-               || chunk_is_token(prev, CT_CONSTEXPR)
-               || chunk_is_token(prev, CT_ELSEIF)
-               || chunk_is_token(prev, CT_WHILE)
-               || chunk_is_token(prev, CT_WHILE_OF_DO)
-               || chunk_is_token(prev, CT_DO)
-               || chunk_is_token(prev, CT_FOR)
-               || chunk_is_token(prev, CT_SWITCH)
-               || chunk_is_token(prev, CT_CATCH)
-               || chunk_is_token(prev, CT_SYNCHRONIZED)
-               || chunk_is_token(prev, CT_D_VERSION)
-               || chunk_is_token(prev, CT_D_VERSION_IF)
-               || chunk_is_token(prev, CT_D_SCOPE)
-               || chunk_is_token(prev, CT_D_SCOPE_IF))
+            if (  prev->Is(CT_IF)
+               || prev->Is(CT_CONSTEXPR)
+               || prev->Is(CT_ELSEIF)
+               || prev->Is(CT_WHILE)
+               || prev->Is(CT_WHILE_OF_DO)
+               || prev->Is(CT_DO)
+               || prev->Is(CT_FOR)
+               || prev->Is(CT_SWITCH)
+               || prev->Is(CT_CATCH)
+               || prev->Is(CT_SYNCHRONIZED)
+               || prev->Is(CT_D_VERSION)
+               || prev->Is(CT_D_VERSION_IF)
+               || prev->Is(CT_D_SCOPE)
+               || prev->Is(CT_D_SCOPE_IF))
             {
-               set_chunk_type(pc, CT_SPAREN_OPEN);
-               parent = frm.top().type;
+               pc->SetType(CT_SPAREN_OPEN);
+               parentType = frm.top().type;
                frm.sparen_count++;
             }
-            else if (chunk_is_token(prev, CT_FUNCTION))
+            else if (prev->Is(CT_FUNCTION))
             {
-               set_chunk_type(pc, CT_FPAREN_OPEN);
-               parent = CT_FUNCTION;
+               pc->SetType(CT_FPAREN_OPEN);
+               parentType = CT_FUNCTION;
             }
             // NS_ENUM and NS_OPTIONS are followed by a (type, name) pair
-            else if (  chunk_is_token(prev, CT_ENUM)
+            else if (  prev->Is(CT_ENUM)
                     && language_is_set(LANG_OC))
             {
                // Treat both as CT_ENUM since the syntax is identical
-               set_chunk_type(pc, CT_FPAREN_OPEN);
-               parent = CT_ENUM;
+               pc->SetType(CT_FPAREN_OPEN);
+               parentType = CT_ENUM;
             }
-            else if (chunk_is_token(prev, CT_DECLSPEC))  // Issue 1289
+            else if (prev->Is(CT_DECLSPEC))  // Issue 1289
             {
-               parent = CT_DECLSPEC;
+               parentType = CT_DECLSPEC;
             }
             // else: no need to set parent
          }
@@ -698,29 +643,29 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
             // Set the parent for open braces
             if (frm.top().stage != brace_stage_e::NONE)
             {
-               parent = frm.top().type;
+               parentType = frm.top().type;
             }
-            else if (  chunk_is_token(prev, CT_ASSIGN)
-                    && (prev->str[0] == '='))
+            else if (  prev->Is(CT_ASSIGN)
+                    && (prev->GetStr()[0] == '='))
             {
-               parent = CT_ASSIGN;
+               parentType = CT_ASSIGN;
             }
-            else if (  chunk_is_token(prev, CT_RETURN)
+            else if (  prev->Is(CT_RETURN)
                     && language_is_set(LANG_CPP))
             {
-               parent = CT_RETURN;
+               parentType = CT_RETURN;
             }
             // Carry through CT_ENUM parent in NS_ENUM (type, name) {
             // only to help the vim command }
-            else if (  chunk_is_token(prev, CT_FPAREN_CLOSE)
+            else if (  prev->Is(CT_FPAREN_CLOSE)
                     && language_is_set(LANG_OC)
-                    && get_chunk_parent_type(prev) == CT_ENUM)
+                    && prev->GetParentType() == CT_ENUM)
             {
-               parent = CT_ENUM;
+               parentType = CT_ENUM;
             }
-            else if (chunk_is_token(prev, CT_FPAREN_CLOSE))
+            else if (prev->Is(CT_FPAREN_CLOSE))
             {
-               parent = CT_FUNCTION;
+               parentType = CT_FUNCTION;
             }
             // else: no need to set parent
          }
@@ -731,32 +676,32 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
     * Adjust the level for opens & create a stack entry
     * Note that CT_VBRACE_OPEN has already been handled.
     */
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_SPAREN_OPEN)
-      || chunk_is_token(pc, CT_ANGLE_OPEN)
-      || chunk_is_token(pc, CT_MACRO_OPEN)
-      || chunk_is_token(pc, CT_SQUARE_OPEN))
+   if (  pc->Is(CT_BRACE_OPEN)
+      || pc->Is(CT_PAREN_OPEN)
+      || pc->Is(CT_FPAREN_OPEN)
+      || pc->Is(CT_SPAREN_OPEN)
+      || pc->Is(CT_ANGLE_OPEN)
+      || pc->Is(CT_MACRO_OPEN)
+      || pc->Is(CT_SQUARE_OPEN))
    {
       frm.level++;
 
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_MACRO_OPEN))
+      if (  pc->Is(CT_BRACE_OPEN)
+         || pc->Is(CT_MACRO_OPEN))
       {
          // Issue #1813
          bool single = false;
 
-         if (get_chunk_parent_type(pc) == CT_NAMESPACE)
+         if (pc->GetParentType() == CT_NAMESPACE)
          {
-            LOG_FMT(LBCSPOP, "%s(%d): parent_type is NAMESPACE\n",
+            LOG_FMT(LBCSPOP, "%s(%d): parent type is NAMESPACE\n",
                     __func__, __LINE__);
             Chunk *tmp = frm.top().pc;
 
             if (  tmp != nullptr
-               && get_chunk_parent_type(tmp) == CT_NAMESPACE)
+               && tmp->GetParentType() == CT_NAMESPACE)
             {
-               LOG_FMT(LBCSPOP, "%s(%d): tmp->parent_type is NAMESPACE\n",
+               LOG_FMT(LBCSPOP, "%s(%d): tmp->GetParentType() is NAMESPACE\n",
                        __func__, __LINE__);
 
                log_rule_B("indent_namespace");
@@ -771,8 +716,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
                }
             }
          }
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s, parent_type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
+         LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
 
          if (!single)
          {
@@ -782,14 +727,13 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          }
       }
       frm.push(pc, __func__, __LINE__);
-      frm.top().parent = parent;
-      // set parent type
-      set_chunk_parent(pc, parent);
+      frm.top().parent = parentType;
+      pc->SetParentType(parentType);
    }
    // Issue #2281
 
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      && pc->parent_type == CT_SWITCH)
+   if (  pc->Is(CT_BRACE_OPEN)
+      && pc->GetParentType() == CT_SWITCH)
    {
       size_t idx = frm.size();
       LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
@@ -799,23 +743,23 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       if (saved != nullptr)
       {
          // set parent member
-         chunk_set_parent(pc, saved);
+         pc->SetParent(saved);
       }
    }
 
-   if (  chunk_is_token(pc, CT_CASE)
-      || chunk_is_token(pc, CT_DEFAULT))
+   if (  pc->Is(CT_CASE)
+      || pc->Is(CT_DEFAULT))
    {
       Chunk *prev = pc->GetPrevNcNnl();         // Issue #3176
 
-      if (  chunk_is_token(pc, CT_CASE)
-         || (  chunk_is_token(pc, CT_DEFAULT)
-            && chunk_is_not_token(prev, CT_ASSIGN)))
+      if (  pc->Is(CT_CASE)
+         || (  pc->Is(CT_DEFAULT)
+            && prev->IsNot(CT_ASSIGN)))
       {
          // it is a CT_DEFAULT from a switch
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-         set_chunk_parent(pc, CT_SWITCH);
+         LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+         pc->SetParentType(CT_SWITCH);
          size_t idx = frm.size();
          LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
                  __func__, __LINE__, idx);
@@ -824,15 +768,15 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          if (saved != nullptr)
          {
             // set parent member
-            chunk_set_parent(pc, saved);
+            pc->SetParent(saved);
          }
       }
    }
 
-   if (chunk_is_token(pc, CT_BREAK))
+   if (pc->Is(CT_BREAK))
    {
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col);
+      LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
       size_t idx = frm.size();
       LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
               __func__, __LINE__, idx);
@@ -841,10 +785,10 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       if (saved != nullptr)
       {
          // set parent member
-         chunk_set_parent(pc, saved);
+         pc->SetParent(saved);
       }
    }
-   const pattern_class_e patcls = get_token_pattern_class(pc->type);
+   const pattern_class_e patcls = get_token_pattern_class(pc->GetType());
 
    /*
     * Create a stack entry for complex statements:
@@ -853,7 +797,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
     */
    if (patcls == pattern_class_e::BRACED)
    {
-      frm.push(pc, __func__, __LINE__, (chunk_is_token(pc, CT_DO) ? brace_stage_e::BRACE_DO
+      frm.push(pc, __func__, __LINE__, (pc->Is(CT_DO) ? brace_stage_e::BRACE_DO
                     : brace_stage_e::BRACE2));
       // "+ComplexBraced"
    }
@@ -861,10 +805,10 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
    {
       brace_stage_e bs = brace_stage_e::PAREN1;
 
-      if (  chunk_is_token(pc, CT_WHILE)
+      if (  pc->Is(CT_WHILE)
          && maybe_while_of_do(pc))
       {
-         set_chunk_type(pc, CT_WHILE_OF_DO);
+         pc->SetType(CT_WHILE_OF_DO);
          bs = brace_stage_e::WOD_PAREN;
       }
       frm.push(pc, __func__, __LINE__, bs);
@@ -887,64 +831,64 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
     *  - after ';', but not if the paren stack top is a paren
     *  - after '(' that has a parent type of CT_FOR
     */
-   if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-      || (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && get_chunk_parent_type(pc) != CT_ASSIGN)
-      || chunk_is_token(pc, CT_BRACE_CLOSE)
-      || chunk_is_token(pc, CT_VBRACE_CLOSE)
-      || (  chunk_is_token(pc, CT_SPAREN_OPEN)
-         && get_chunk_parent_type(pc) == CT_FOR)
-      || chunk_is_token(pc, CT_COLON)
-      || chunk_is_token(pc, CT_OC_END)
-      || (  chunk_is_semicolon(pc)
+   if (  pc->Is(CT_SQUARE_OPEN)
+      || (  pc->Is(CT_BRACE_OPEN)
+         && pc->GetParentType() != CT_ASSIGN)
+      || pc->Is(CT_BRACE_CLOSE)
+      || pc->Is(CT_VBRACE_CLOSE)
+      || (  pc->Is(CT_SPAREN_OPEN)
+         && pc->GetParentType() == CT_FOR)
+      || 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)
-      || chunk_is_token(pc, CT_MACRO))                         // Issue #2742
+      || pc->Is(CT_MACRO))                         // Issue #2742
    {
-      LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->Text());
+      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);
    }
    // Mark expression starts
-   LOG_FMT(LSTMT, "%s(%d): Mark expression starts: orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+   LOG_FMT(LSTMT, "%s(%d): Mark expression starts: orig line is %zu, orig col is %zu, Text() is '%s'\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
    Chunk *tmp = pc->GetNextNcNnl();
 
-   if (  chunk_is_token(pc, CT_ARITH)
-      || chunk_is_token(pc, CT_SHIFT)
-      || chunk_is_token(pc, CT_ASSIGN)
-      || chunk_is_token(pc, CT_CASE)
-      || chunk_is_token(pc, CT_COMPARE)
-      || (  chunk_is_token(pc, CT_STAR)
-         && chunk_is_not_token(tmp, CT_STAR))
-      || chunk_is_token(pc, CT_BOOL)
-      || chunk_is_token(pc, CT_MINUS)
-      || chunk_is_token(pc, CT_PLUS)
-      || chunk_is_token(pc, CT_CARET)
-      || chunk_is_token(pc, CT_ANGLE_OPEN)
-      || chunk_is_token(pc, CT_ANGLE_CLOSE)
-      || chunk_is_token(pc, CT_RETURN)
-      || chunk_is_token(pc, CT_THROW)
-      || chunk_is_token(pc, CT_GOTO)
-      || chunk_is_token(pc, CT_CONTINUE)
-      || chunk_is_token(pc, CT_PAREN_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || chunk_is_token(pc, CT_SPAREN_OPEN)
-      || chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_semicolon(pc)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_NOT)
-      || chunk_is_token(pc, CT_INV)
-      || chunk_is_token(pc, CT_COLON)
-      || chunk_is_token(pc, CT_QUESTION))
+   if (  pc->Is(CT_ARITH)
+      || pc->Is(CT_SHIFT)
+      || pc->Is(CT_ASSIGN)
+      || pc->Is(CT_CASE)
+      || pc->Is(CT_COMPARE)
+      || (  pc->Is(CT_STAR)
+         && tmp->IsNot(CT_STAR))
+      || pc->Is(CT_BOOL)
+      || pc->Is(CT_MINUS)
+      || pc->Is(CT_PLUS)
+      || pc->Is(CT_CARET)
+      || pc->Is(CT_ANGLE_OPEN)
+      || pc->Is(CT_ANGLE_CLOSE)
+      || pc->Is(CT_RETURN)
+      || pc->Is(CT_THROW)
+      || pc->Is(CT_GOTO)
+      || pc->Is(CT_CONTINUE)
+      || pc->Is(CT_PAREN_OPEN)
+      || pc->Is(CT_FPAREN_OPEN)
+      || pc->Is(CT_SPAREN_OPEN)
+      || pc->Is(CT_BRACE_OPEN)
+      || pc->IsSemicolon()
+      || pc->Is(CT_COMMA)
+      || pc->Is(CT_NOT)
+      || pc->Is(CT_INV)
+      || pc->Is(CT_COLON)
+      || pc->Is(CT_QUESTION))
    {
       frm.expr_count = 0;
-      LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, orig_col is %zu, reset expr on '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+      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
 
@@ -961,7 +905,7 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    // Turn an optional parenthesis into either a real parenthesis or a brace
    if (frm.top().stage == brace_stage_e::OP_PAREN1)
    {
-      frm.top().stage = (chunk_is_not_token(pc, CT_PAREN_OPEN))
+      frm.top().stage = (pc->IsNot(CT_PAREN_OPEN))
                         ? brace_stage_e::BRACE2
                         : brace_stage_e::PAREN1;
       LOG_FMT(LBCSPOP, "%s(%d): frm.top().stage is now %s\n",
@@ -971,7 +915,7 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    // Check for CT_ELSE after CT_IF
    while (frm.top().stage == brace_stage_e::ELSE)
    {
-      if (chunk_is_token(pc, CT_ELSE))
+      if (pc->Is(CT_ELSE))
       {
          // Replace CT_IF with CT_ELSE on the stack & we are done
          frm.top().type  = CT_ELSE;
@@ -981,8 +925,8 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
          return(true);
       }
       // Remove the CT_IF and close the statement
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      LOG_FMT(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);
       print_stack(LBCSPOP, "-IF-CCS ", frm);
 
@@ -997,12 +941,12 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    {
       log_rule_B("indent_else_if");
 
-      if (  chunk_is_token(pc, CT_IF)
+      if (  pc->Is(CT_IF)
          && (  !options::indent_else_if()
-            || !chunk_is_newline(pc->GetPrevNc())))
+            || !pc->GetPrevNc()->IsNewline()))
       {
          // Replace CT_ELSE with CT_IF
-         set_chunk_type(pc, CT_ELSEIF);
+         pc->SetType(CT_ELSEIF);
          frm.top().type  = CT_ELSEIF;
          frm.top().stage = brace_stage_e::PAREN1;
          return(true);
@@ -1014,30 +958,30 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    // Check for CT_CATCH or CT_FINALLY after CT_TRY or CT_CATCH
    while (frm.top().stage == brace_stage_e::CATCH)
    {
-      if (  chunk_is_token(pc, CT_CATCH)
-         || chunk_is_token(pc, CT_FINALLY))
+      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->type;
+         frm.top().type = pc->GetType();
 
          if (language_is_set(LANG_CS))
          {
-            frm.top().stage = (chunk_is_token(pc, CT_CATCH)) ? brace_stage_e::CATCH_WHEN : brace_stage_e::BRACE2;
+            frm.top().stage = (pc->Is(CT_CATCH)) ? brace_stage_e::CATCH_WHEN : brace_stage_e::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 = (chunk_is_token(pc, CT_CATCH)) ? brace_stage_e::PAREN1 : brace_stage_e::BRACE2;
+            frm.top().stage = (pc->Is(CT_CATCH)) ? brace_stage_e::PAREN1 : brace_stage_e::BRACE2;
          }
          print_stack(LBCSSWAP, "=Swap   ", frm);
 
          return(true);
       }
       // Remove the CT_TRY and close the statement
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      LOG_FMT(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);
       print_stack(LBCSPOP, "-TRY-CCS ", frm);
 
@@ -1050,25 +994,25 @@ 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 (chunk_is_token(pc, CT_PAREN_OPEN)) // this is for the paren after "catch"
+      if (pc->Is(CT_PAREN_OPEN)) // this is for the paren after "catch"
       {
          // Replace CT_PAREN_OPEN with CT_SPAREN_OPEN
-         set_chunk_type(pc, CT_SPAREN_OPEN);
-         frm.top().type  = pc->type;
+         pc->SetType(CT_SPAREN_OPEN);
+         frm.top().type  = pc->GetType();
          frm.top().stage = brace_stage_e::PAREN1;
 
          return(false);
       }
 
-      if (chunk_is_token(pc, CT_WHEN))
+      if (pc->Is(CT_WHEN))
       {
-         frm.top().type  = pc->type;
+         frm.top().type  = pc->GetType();
          frm.top().stage = brace_stage_e::OP_PAREN1;
 
          return(true);
       }
 
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
+      if (pc->Is(CT_BRACE_OPEN))
       {
          frm.top().stage = brace_stage_e::BRACE2;
 
@@ -1079,72 +1023,72 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    // Check for CT_WHILE after the CT_DO
    if (frm.top().stage == brace_stage_e::WHILE)
    {
-      if (chunk_is_token(pc, CT_WHILE))
+      if (pc->Is(CT_WHILE))
       {
-         set_chunk_type(pc, CT_WHILE_OF_DO);
+         pc->SetType(CT_WHILE_OF_DO);
          frm.top().type  = CT_WHILE_OF_DO; //CT_WHILE;
          frm.top().stage = brace_stage_e::WOD_PAREN;
 
          return(true);
       }
-      LOG_FMT(LWARN, "%s(%d): %s, orig_line is %zu, Error: Expected 'while', got '%s'\n",
-              __func__, __LINE__, cpd.filename.c_str(), pc->orig_line,
+      LOG_FMT(LWARN, "%s(%d): %s, orig line is %zu, Error: Expected 'while', got '%s'\n",
+              __func__, __LINE__, cpd.filename.c_str(), pc->GetOrigLine(),
               pc->Text());
-      LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      LOG_FMT(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);
       print_stack(LBCSPOP, "-Error  ", frm);
-      cpd.error_count++;
+      exit(EX_SOFTWARE);
    }
    // Insert a CT_VBRACE_OPEN, if needed
    // but not in a preprocessor
    atest = frm.top().stage;
 
-   if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-      && !pc->flags.test(PCF_IN_PREPROC)
+   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)))
    {
       log_rule_B("indent_using_block");
 
       if (  language_is_set(LANG_CS)
-         && chunk_is_token(pc, CT_USING_STMT)
+         && pc->Is(CT_USING_STMT)
          && (!options::indent_using_block()))
       {
          // don't indent the using block
       }
       else
       {
-         const E_Token parent = frm.top().type;
+         const E_Token parentType = frm.top().type;
 
          Chunk         *vbrace = insert_vbrace_open_before(pc, frm);
-         set_chunk_parent(vbrace, parent);
+         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);
-         log_pcf_flags(LBCSPOP, pc->flags);
+         log_pcf_flags(LBCSPOP, pc->GetFlags());
 
          frm.push(vbrace, __func__, __LINE__, brace_stage_e::NONE);
          // "+VBrace");
 
-         frm.top().parent = parent;
+         frm.top().parent = parentType;
 
          // update the level of pc
-         pc->level       = frm.level;
-         pc->brace_level = frm.brace_level;
+         pc->SetLevel(frm.level);
+         pc->SetBraceLevel(frm.brace_level);
 
          // 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);
-         chunk_flags_set(pc, PCF_STMT_START | PCF_EXPR_START);
+         pc->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
          frm.stmt_count = 1;
          frm.expr_count = 1;
-         LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, 2.marked '%s' as stmt start\n",
-                 __func__, __LINE__, pc->orig_line, pc->Text());
+         LOG_FMT(LSTMT, "%s(%d): orig line is %zu, 2.marked '%s' as stmt start\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->Text());
       }
    }
 
@@ -1152,26 +1096,26 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    if (  frm.top().stage == brace_stage_e::PAREN1
       && (  frm.top().type == CT_IF
          || frm.top().type == CT_ELSEIF)
-      && chunk_is_token(pc, CT_CONSTEXPR))
+      && pc->Is(CT_CONSTEXPR))
    {
       return(false);
    }
 
    // Verify open parenthesis in complex statement
-   if (  chunk_is_not_token(pc, CT_PAREN_OPEN)
+   if (  pc->IsNot(CT_PAREN_OPEN)
       && (  (frm.top().stage == brace_stage_e::PAREN1)
          || (frm.top().stage == brace_stage_e::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->orig_line, pc->Text(),
+      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));
 
       // 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",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      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);
       print_stack(LBCSPOP, "-Error  ", frm);
-      cpd.error_count++;
+      exit(EX_SOFTWARE);
    }
    return(false);
 } // check_complex_statements
@@ -1183,10 +1127,9 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
 
    if (frm.top().stage == brace_stage_e::PAREN1)
    {
-      if (  pc->next != nullptr
-         && pc->next->type == CT_WHEN)
+      if (pc->GetNext()->GetType() == CT_WHEN)
       {
-         frm.top().type  = pc->type;
+         frm.top().type  = pc->GetType();
          frm.top().stage = brace_stage_e::CATCH_WHEN;
 
          return(true);
@@ -1206,10 +1149,10 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
          Chunk *next = pc->GetNextNcNnl();
 
          if (  next->IsNullChunk()
-            || chunk_is_not_token(next, CT_ELSE))
+            || next->IsNot(CT_ELSE))
          {
-            LOG_FMT(LBCSPOP, "%s(%d): no CT_ELSE, pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            LOG_FMT(LBCSPOP, "%s(%d): no CT_ELSE, 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);
             print_stack(LBCSPOP, "-IF-HCS ", frm);
 
@@ -1224,11 +1167,11 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
          // If the next chunk isn't CT_CATCH or CT_FINALLY, close the statement
          Chunk *next = pc->GetNextNcNnl();
 
-         if (  chunk_is_not_token(next, CT_CATCH)
-            && chunk_is_not_token(next, CT_FINALLY))
+         if (  next->IsNot(CT_CATCH)
+            && next->IsNot(CT_FINALLY))
          {
-            LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            LOG_FMT(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);
             print_stack(LBCSPOP, "-TRY-HCS ", frm);
 
@@ -1239,8 +1182,8 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
       {
          LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::BRACE2\n",
                  __func__, __LINE__, get_token_name(frm.top().type));
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         LOG_FMT(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);
          print_stack(LBCSPOP, "-HCC B2 ", frm);
 
@@ -1262,8 +1205,8 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
    {
       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(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      LOG_FMT(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);
       print_stack(LBCSPOP, "-HCC WoDS ", frm);
 
@@ -1273,10 +1216,10 @@ 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->orig_line,
+              __func__, __LINE__, cpd.filename.c_str(), pc->GetOrigLine(),
               get_token_name(frm.top().type),
               (unsigned int)frm.top().stage);
-      cpd.error_count++;
+      exit(EX_SOFTWARE);
    }
    return(false);
 } // handle_complex_close
@@ -1291,24 +1234,24 @@ static void mark_namespace(Chunk *pns)
 
    Chunk *pc = pns->GetPrevNcNnl();
 
-   if (chunk_is_token(pc, CT_USING))
+   if (pc->Is(CT_USING))
    {
       is_using = true;
-      set_chunk_parent(pns, CT_USING);
+      pns->SetParentType(CT_USING);
    }
    pc = pns->GetNextNcNnl();
 
    while (pc->IsNotNullChunk())
    {
-      set_chunk_parent(pc, CT_NAMESPACE);
+      pc->SetParentType(CT_NAMESPACE);
 
-      if (chunk_is_not_token(pc, CT_BRACE_OPEN))
+      if (pc->IsNot(CT_BRACE_OPEN))
       {
-         if (chunk_is_token(pc, CT_SEMICOLON))
+         if (pc->Is(CT_SEMICOLON))
          {
             if (is_using)
             {
-               set_chunk_parent(pc, CT_USING);
+               pc->SetParentType(CT_USING);
             }
             return;
          }
@@ -1318,12 +1261,12 @@ static void mark_namespace(Chunk *pns)
       log_rule_B("indent_namespace_limit");
 
       if (  (options::indent_namespace_limit() > 0)
-         && ((br_close = chunk_skip_to_match(pc)) != nullptr))
+         && ((br_close = pc->GetClosingParen())->IsNotNullChunk()))
       {
-         // br_close->orig_line is always >= pc->orig_line;
-         size_t numberOfLines = br_close->orig_line - pc->orig_line - 1;                 // Issue #2345
-         LOG_FMT(LTOK, "%s(%d): br_close->orig_line is %zu, pc->orig_line is %zu\n",
-                 __func__, __LINE__, br_close->orig_line, pc->orig_line);
+         // br_close->GetOrigLine() is always >= pc->GetOrigLine();
+         size_t numberOfLines = br_close->GetOrigLine() - pc->GetOrigLine() - 1;                 // Issue #2345
+         LOG_FMT(LTOK, "%s(%d): br_close orig line is %zu, pc orig line is %zu\n",
+                 __func__, __LINE__, br_close->GetOrigLine(), pc->GetOrigLine());
          LOG_FMT(LTOK, "%s(%d): numberOfLines is %zu, indent_namespace_limit() is %d\n",
                  __func__, __LINE__, numberOfLines, options::indent_namespace_limit());
 
@@ -1332,8 +1275,8 @@ static void mark_namespace(Chunk *pns)
          if (numberOfLines > options::indent_namespace_limit())
          {
             LOG_FMT(LTOK, "%s(%d): PCF_LONG_BLOCK is set\n", __func__, __LINE__);
-            chunk_flags_set(pc, PCF_LONG_BLOCK);
-            chunk_flags_set(br_close, PCF_LONG_BLOCK);
+            pc->SetFlagBits(PCF_LONG_BLOCK);
+            br_close->SetFlagBits(PCF_LONG_BLOCK);
          }
       }
       flag_parens(pc, PCF_IN_NAMESPACE, CT_NONE, CT_NAMESPACE, false);
@@ -1348,19 +1291,19 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
 
    Chunk chunk;
 
-   set_chunk_parent(&chunk, frm.top().type);
-   chunk.orig_line   = pc->orig_line;
-   chunk.level       = frm.level;
-   chunk.pp_level    = frm.pp_level;
-   chunk.brace_level = frm.brace_level;
-   chunk.flags       = pc->flags & PCF_COPY_FLAGS;
-   chunk.str         = "";
+   chunk.SetParentType(frm.top().type);
+   chunk.SetOrigLine(pc->GetOrigLine());
+   chunk.SetLevel(frm.level);
+   chunk.SetPpLevel(frm.pp_level);
+   chunk.SetBraceLevel(frm.brace_level);
+   chunk.SetFlags(pc->GetFlags() & PCF_COPY_FLAGS);
+   chunk.Str() = "";
 
    if (after)
    {
-      chunk.orig_col = pc->orig_col;
-      set_chunk_type(&chunk, CT_VBRACE_CLOSE);
-      return(chunk_add_after(&chunk, pc));
+      chunk.SetOrigCol(pc->GetOrigCol());
+      chunk.SetType(CT_VBRACE_CLOSE);
+      return(chunk.CopyAndAddAfter(pc));
    }
    Chunk *ref = pc->GetPrev();
 
@@ -1369,17 +1312,16 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
       return(nullptr);
    }
 
-   if (!ref->flags.test(PCF_IN_PREPROC))
+   if (!ref->TestFlags(PCF_IN_PREPROC))
    {
-      chunk.flags &= ~PCF_IN_PREPROC;
+      chunk.ResetFlagBits(PCF_IN_PREPROC);
    }
    bool ref_is_comment = ref->IsComment();      // Issue #3351
 
-   while (  chunk_is_newline(ref)
-         || ref->IsComment())
+   while (ref->IsCommentOrNewline())
    {
-      ref->level++;
-      ref->brace_level++;
+      ref->SetLevel(ref->GetLevel() + 1);
+      ref->SetBraceLevel(ref->GetBraceLevel() + 1);
       ref = ref->GetPrev();
    }
 
@@ -1389,13 +1331,13 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
    }
 
    // Don't back into a preprocessor
-   if (  !pc->flags.test(PCF_IN_PREPROC)
-      && ref->flags.test(PCF_IN_PREPROC))
+   if (  !pc->TestFlags(PCF_IN_PREPROC)
+      && ref->TestFlags(PCF_IN_PREPROC))
    {
-      if (chunk_is_token(ref, CT_PREPROC_BODY))
+      if (ref->Is(CT_PREPROC_BODY))
       {
          while (  ref->IsNotNullChunk()
-               && ref->flags.test(PCF_IN_PREPROC))
+               && ref->TestFlags(PCF_IN_PREPROC))
          {
             ref = ref->GetPrev();
          }
@@ -1404,7 +1346,7 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
       {
          ref = ref->GetNext();
 
-         if (chunk_is_token(ref, CT_COMMENT)) // Issue #3034
+         if (ref->Is(CT_COMMENT)) // Issue #3034
          {
             ref = ref->GetNextNc();
          }
@@ -1420,13 +1362,13 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
    {
       return(nullptr);
    }
-   chunk.orig_line = ref->orig_line;
-   chunk.orig_col  = ref->orig_col;
-   chunk.column    = ref->column + ref->Len() + 1;
-   chunk.pp_level  = ref->pp_level;                         // Issue #3055
-   set_chunk_type(&chunk, CT_VBRACE_OPEN);
+   chunk.SetOrigLine(ref->GetOrigLine());
+   chunk.SetOrigCol(ref->GetOrigCol());
+   chunk.SetColumn(ref->GetColumn() + ref->Len() + 1);
+   chunk.SetPpLevel(ref->GetPpLevel());                         // Issue #3055
+   chunk.SetType(CT_VBRACE_OPEN);
 
-   return(chunk_add_after(&chunk, ref));
+   return(chunk.CopyAndAddAfter(ref));
 } // insert_vbrace
 
 
@@ -1434,14 +1376,15 @@ bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
+   if (  pc == nullptr
+      || pc->IsNullChunk())
    {
       throw invalid_argument(string(__func__) + ":" + to_string(__LINE__)
                              + "args cannot be nullptr");
    }
-   LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s, '%s' type is %s, stage is %u\n",
-           __func__, __LINE__, pc->orig_line,
-           get_token_name(pc->type), pc->Text(),
+   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);
 
@@ -1449,8 +1392,8 @@ bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
    {
       frm.stmt_count = 0;
       frm.expr_count = 0;
-      LOG_FMT(LSTMT, "%s(%d): orig_line is %zu> reset2 stmt on '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->Text());
+      LOG_FMT(LSTMT, "%s(%d): orig line is %zu> reset2 stmt on '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->Text());
    }
    /*
     * Insert a CT_VBRACE_CLOSE, if needed:
@@ -1473,18 +1416,18 @@ bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
          frm.level--;
          frm.brace_level--;
          vbc = insert_vbrace_close_after(vbc, frm);
-         set_chunk_parent(vbc, frm.top().parent);
+         vbc->SetParentType(frm.top().parent);
 
          LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level decreased to %zu\n",
                  __func__, __LINE__, frm.brace_level);
-         log_pcf_flags(LBCSPOP, pc->flags);
-         LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         log_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->level       = frm.level;
-         pc->brace_level = frm.brace_level;
+         pc->SetLevel(frm.level);
+         pc->SetBraceLevel(frm.brace_level);
 
          print_stack(LBCSPOP, "-CS VB  ", frm);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.h
index 4b2cfbba..e281d2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.h
@@ -17,7 +17,7 @@
  * Scans through the whole list and does stuff.
  * It has to do some tricks to parse preprocessors.
  */
-void brace_cleanup(void);
+void brace_cleanup();
 
 
 #endif /* BRACE_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.cpp
index 0f88354c..1737e79e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.cpp
@@ -28,11 +28,11 @@ static void convert_brace(Chunk *br);
 static void convert_vbrace(Chunk *br);
 
 
-static void convert_vbrace_to_brace(void);
+static void convert_vbrace_to_brace();
 
 
 //! Go backwards to honor brace newline removal limits
-static void examine_braces(void);
+static void examine_braces();
 
 
 /**
@@ -42,16 +42,16 @@ static void examine_braces(void);
 static void examine_brace(Chunk *bopen);
 
 
-static void move_case_break(void);
+static void move_case_break();
 
 
-static void move_case_return(void);
+static void move_case_return();
 
 
-static void mod_case_brace(void);
+static void mod_case_brace();
 
 
-static void mod_full_brace_if_chain(void);
+static void mod_full_brace_if_chain();
 
 
 /**
@@ -116,23 +116,23 @@ static void process_if_chain(Chunk *br_start);
 static bool paren_multiline_before_brace(Chunk *brace)
 {
    if (  brace == nullptr
-      || (  chunk_is_not_token(brace, CT_BRACE_OPEN)
-         && chunk_is_not_token(brace, CT_BRACE_CLOSE))
-      || (  get_chunk_parent_type(brace) != CT_IF
-         && get_chunk_parent_type(brace) != CT_ELSEIF
-         && get_chunk_parent_type(brace) != CT_FOR
-         && get_chunk_parent_type(brace) != CT_USING_STMT
-         && get_chunk_parent_type(brace) != CT_WHILE
-         && get_chunk_parent_type(brace) != CT_FUNC_CLASS_DEF
-         && get_chunk_parent_type(brace) != CT_FUNC_DEF))
+      || (  brace->IsNot(CT_BRACE_OPEN)
+         && brace->IsNot(CT_BRACE_CLOSE))
+      || (  brace->GetParentType() != CT_IF
+         && brace->GetParentType() != CT_ELSEIF
+         && brace->GetParentType() != CT_FOR
+         && brace->GetParentType() != CT_USING_STMT
+         && brace->GetParentType() != CT_WHILE
+         && brace->GetParentType() != CT_FUNC_CLASS_DEF
+         && brace->GetParentType() != CT_FUNC_DEF))
    {
       return(false);
    }
    const auto paren_t = CT_SPAREN_CLOSE;
 
    // find parenthesis pair of the if/for/while/...
-   auto paren_close = brace->GetPrevType(paren_t, brace->level, E_Scope::ALL);
-   auto paren_open  = chunk_skip_to_match_rev(paren_close, E_Scope::ALL);
+   auto paren_close = brace->GetPrevType(paren_t, brace->GetLevel(), E_Scope::ALL);
+   auto paren_open  = paren_close->GetOpeningParen();
 
    if (  paren_close->IsNullChunk()
       || paren_open->IsNullChunk()
@@ -155,7 +155,7 @@ static bool paren_multiline_before_brace(Chunk *brace)
 }
 
 
-void do_braces(void)
+void do_braces()
 {
    LOG_FUNC_ENTRY();
    // Mark one-liners
@@ -164,34 +164,34 @@ void do_braces(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && chunk_is_not_token(pc, CT_VBRACE_OPEN))
+      if (  pc->IsNot(CT_BRACE_OPEN)
+         && pc->IsNot(CT_VBRACE_OPEN))
       {
          pc = pc->GetNextNcNnl();
          continue;
       }
       Chunk         *br_open = pc;
-      const E_Token brc_type = E_Token(pc->type + 1); // corresponds to closing type
+      const E_Token brc_type = E_Token(pc->GetType() + 1); // corresponds to closing type
       // Detect empty bodies
       Chunk         *tmp = pc->GetNextNcNnl();
 
-      if (chunk_is_token(tmp, brc_type))
+      if (tmp->Is(brc_type))
       {
-         chunk_flags_set(br_open, PCF_EMPTY_BODY);
-         chunk_flags_set(tmp, PCF_EMPTY_BODY);
+         br_open->SetFlagBits(PCF_EMPTY_BODY);
+         tmp->SetFlagBits(PCF_EMPTY_BODY);
       }
       // Scan for the brace close or a newline
       tmp = br_open->GetNextNc();
 
       while (tmp->IsNotNullChunk())
       {
-         if (chunk_is_newline(tmp))
+         if (tmp->IsNewline())
          {
             break;
          }
 
-         if (  chunk_is_token(tmp, brc_type)
-            && br_open->level == tmp->level)
+         if (  tmp->Is(brc_type)
+            && br_open->GetLevel() == tmp->GetLevel())
          {
             flag_series(br_open, tmp, PCF_ONE_LINER);
             break;
@@ -260,7 +260,7 @@ void do_braces(void)
 } // do_braces
 
 
-static void examine_braces(void)
+static void examine_braces()
 {
    LOG_FUNC_ENTRY();
 
@@ -275,21 +275,21 @@ static void examine_braces(void)
 
    for (Chunk *pc = Chunk::GetTail(); pc->IsNotNullChunk();)
    {
-      Chunk *prev = pc->GetPrevType(CT_BRACE_OPEN, -1);
+      Chunk *prev = pc->GetPrevType(CT_BRACE_OPEN);
 
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         && !pc->flags.test(PCF_IN_PREPROC)
-         && (  (  (  get_chunk_parent_type(pc) == CT_IF
-                  || get_chunk_parent_type(pc) == CT_ELSE
-                  || get_chunk_parent_type(pc) == CT_ELSEIF)
+      if (  pc->Is(CT_BRACE_OPEN)
+         && !pc->TestFlags(PCF_IN_PREPROC)
+         && (  (  (  pc->GetParentType() == CT_IF
+                  || pc->GetParentType() == CT_ELSE
+                  || pc->GetParentType() == CT_ELSEIF)
                && options::mod_full_brace_if() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_DO
+            || (  pc->GetParentType() == CT_DO
                && options::mod_full_brace_do() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_FOR
+            || (  pc->GetParentType() == CT_FOR
                && options::mod_full_brace_for() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_USING_STMT
+            || (  pc->GetParentType() == CT_USING_STMT
                && options::mod_full_brace_using() == IARF_REMOVE)
-            || (  get_chunk_parent_type(pc) == CT_WHILE
+            || (  pc->GetParentType() == CT_WHILE
                && options::mod_full_brace_while() == IARF_REMOVE)))
       {
          if (  multiline_block
@@ -316,25 +316,25 @@ static bool should_add_braces(Chunk *vbopen)
       return(false);
    }
    LOG_FMT(LBRDEL, "%s(%d): start on %zu:\n",
-           __func__, __LINE__, vbopen->orig_line);
+           __func__, __LINE__, vbopen->GetOrigLine());
 
    size_t nl_count = 0;
 
    Chunk  *pc = Chunk::NullChunkPtr;
 
    for (pc = vbopen->GetNextNc(E_Scope::PREPROC);
-        (pc->IsNotNullChunk() && pc->level > vbopen->level);
+        (pc->IsNotNullChunk() && pc->GetLevel() > vbopen->GetLevel());
         pc = pc->GetNextNc(E_Scope::PREPROC))
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         nl_count += pc->nl_count;
+         nl_count += pc->GetNlCount();
       }
    }
 
    if (  pc->IsNotNullChunk()
       && nl_count > nl_max
-      && vbopen->pp_level == pc->pp_level)
+      && vbopen->GetPpLevel() == pc->GetPpLevel())
    {
       LOG_FMT(LBRDEL, "%s(%d): exceeded %zu newlines\n",
               __func__, __LINE__, nl_max);
@@ -348,21 +348,21 @@ static bool can_remove_braces(Chunk *bopen)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LBRDEL, "%s(%d): start on line %zu:\n",
-           __func__, __LINE__, bopen->orig_line);
+           __func__, __LINE__, bopen->GetOrigLine());
 
    // Cannot remove braces inside a preprocessor
-   if (bopen->flags.test(PCF_IN_PREPROC))
+   if (bopen->TestFlags(PCF_IN_PREPROC))
    {
       return(false);
    }
    Chunk *pc = bopen->GetNextNcNnl(E_Scope::PREPROC);
 
-   if (chunk_is_token(pc, CT_BRACE_CLOSE))
+   if (pc->Is(CT_BRACE_CLOSE))
    {
       // Can't remove empty statement
       return(false);
    }
-   const size_t level = bopen->level + 1;
+   const size_t level = bopen->GetLevel() + 1;
 
    log_rule_B("mod_full_brace_nl");
    const size_t nl_max = options::mod_full_brace_nl();
@@ -375,24 +375,24 @@ static bool can_remove_braces(Chunk *bopen)
    int          br_count   = 0;
 
    pc = bopen->GetNextNc(E_Scope::ALL);
-   LOG_FMT(LBRDEL, "%s(%d):  - begin with token '%s', orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+   LOG_FMT(LBRDEL, "%s(%d):  - begin with token '%s', orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
 
    while (  pc->IsNotNullChunk()
-         && pc->level >= level)
+         && pc->GetLevel() >= level)
    {
-      LOG_FMT(LBRDEL, "%s(%d): test token '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+      LOG_FMT(LBRDEL, "%s(%d): test token '%s', orig line is %zu, orig col is %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
 
-      if (pc->flags.test(PCF_IN_PREPROC))
+      if (pc->TestFlags(PCF_IN_PREPROC))
       {
          // Cannot remove braces that contain a preprocessor
          return(false);
       }
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         nl_count += pc->nl_count;
+         nl_count += pc->GetNlCount();
 
          if (  nl_max > 0
             && nl_count > nl_max)
@@ -404,22 +404,22 @@ static bool can_remove_braces(Chunk *bopen)
       }
       else
       {
-         if (chunk_is_token(pc, CT_BRACE_OPEN))
+         if (pc->Is(CT_BRACE_OPEN))
          {
             br_count++;
          }
-         else if (chunk_is_token(pc, CT_BRACE_CLOSE))
+         else if (pc->Is(CT_BRACE_CLOSE))
          {
             if (br_count == 0)
             {
                fprintf(stderr, "%s(%d): br_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col);
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                log_flush(true);
                exit(EX_SOFTWARE);
             }
             br_count--;
 
-            if (pc->level == level)
+            if (pc->GetLevel() == level)
             {
                // mean a statement in a braces { stmt; }
                // as a statement with a semicolon { stmt; };
@@ -427,14 +427,14 @@ static bool can_remove_braces(Chunk *bopen)
                hit_semi = true;
             }
          }
-         else if (  (  chunk_is_token(pc, CT_IF)
-                    || chunk_is_token(pc, CT_ELSEIF))
+         else if (  (  pc->Is(CT_IF)
+                    || pc->Is(CT_ELSEIF))
                  && br_count == 0)
          {
             if_count++;
          }
 
-         if (pc->level == level)
+         if (pc->GetLevel() == level)
          {
             if (  semi_count > 0
                && hit_semi)
@@ -443,32 +443,32 @@ static bool can_remove_braces(Chunk *bopen)
                LOG_FMT(LBRDEL, "%s(%d):  no close brace\n", __func__, __LINE__);
                return(false);
             }
-            LOG_FMT(LBRDEL, "%s(%d): Text() '%s', orig_line is %zu, semi_count is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, semi_count);
+            LOG_FMT(LBRDEL, "%s(%d): Text() '%s', orig line is %zu, semi_count is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), semi_count);
 
-            if (chunk_is_token(pc, CT_ELSE))
+            if (pc->Is(CT_ELSE))
             {
                LOG_FMT(LBRDEL, "%s(%d):  bailed on '%s' on line %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line);
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine());
                return(false);
             }
 
-            if (  chunk_is_semicolon(pc)
-               || chunk_is_token(pc, CT_IF)
-               || chunk_is_token(pc, CT_ELSEIF)
-               || chunk_is_token(pc, CT_FOR)
-               || chunk_is_token(pc, CT_DO)
-               || chunk_is_token(pc, CT_WHILE)
-               || chunk_is_token(pc, CT_USING_STMT)
-               || (  chunk_is_token(pc, CT_BRACE_OPEN)
-                  && chunk_is_token(prev, CT_FPAREN_CLOSE)))
+            if (  pc->IsSemicolon()
+               || pc->Is(CT_IF)
+               || pc->Is(CT_ELSEIF)
+               || pc->Is(CT_FOR)
+               || pc->Is(CT_DO)
+               || pc->Is(CT_WHILE)
+               || pc->Is(CT_USING_STMT)
+               || (  pc->Is(CT_BRACE_OPEN)
+                  && prev->Is(CT_FPAREN_CLOSE)))
             {
-               hit_semi |= chunk_is_semicolon(pc);
+               hit_semi |= pc->IsSemicolon();
 
                if (++semi_count > 1)
                {
                   LOG_FMT(LBRDEL, "%s(%d):  bailed on %zu because of '%s' on line %zu\n",
-                          __func__, __LINE__, bopen->orig_line, pc->Text(), pc->orig_line);
+                          __func__, __LINE__, bopen->GetOrigLine(), pc->Text(), pc->GetOrigLine());
                   return(false);
                }
             }
@@ -484,38 +484,37 @@ static bool can_remove_braces(Chunk *bopen)
       return(false);
    }
 
-   if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-      && get_chunk_parent_type(pc) == CT_IF)
+   if (  pc->Is(CT_BRACE_CLOSE)
+      && pc->GetParentType() == CT_IF)
    {
       Chunk *next     = pc->GetNextNcNnl(E_Scope::PREPROC);
       Chunk *tmp_prev = pc->GetPrevNcNnl(E_Scope::PREPROC);
 
-      if (  chunk_is_token(next, CT_ELSE)
-         && (  chunk_is_token(tmp_prev, CT_BRACE_CLOSE)
-            || chunk_is_token(tmp_prev, CT_VBRACE_CLOSE))
-         && get_chunk_parent_type(tmp_prev) == CT_IF)
+      if (  next->Is(CT_ELSE)
+         && tmp_prev->IsBraceClose()
+         && tmp_prev->GetParentType() == CT_IF)
       {
          LOG_FMT(LBRDEL, "%s(%d):  - bailed on '%s'[%s] on line %zu due to 'if' and 'else' sequence\n",
-                 __func__, __LINE__, get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-                 pc->orig_line);
+                 __func__, __LINE__, get_token_name(pc->GetType()), get_token_name(pc->GetParentType()),
+                 pc->GetOrigLine());
          return(false);
       }
    }
    LOG_FMT(LBRDEL, "%s(%d):  - end on '%s' on line %zu. if_count is %zu semi_count is %zu\n",
-           __func__, __LINE__, get_token_name(pc->type), pc->orig_line, if_count, semi_count);
+           __func__, __LINE__, get_token_name(pc->GetType()), pc->GetOrigLine(), if_count, semi_count);
 
-   return(  chunk_is_token(pc, CT_BRACE_CLOSE)
-         && pc->pp_level == bopen->pp_level);
+   return(  pc->Is(CT_BRACE_CLOSE)
+         && pc->GetPpLevel() == bopen->GetPpLevel());
 } // can_remove_braces
 
 
 static void examine_brace(Chunk *bopen)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LBRDEL, "%s(%d): start on orig_line %zu, bopen->level is %zu\n",
-           __func__, __LINE__, bopen->orig_line, bopen->level);
+   LOG_FMT(LBRDEL, "%s(%d): start on orig line %zu, bopen->GetLevel() is %zu\n",
+           __func__, __LINE__, bopen->GetOrigLine(), bopen->GetLevel());
 
-   const size_t level = bopen->level + 1;
+   const size_t level = bopen->GetLevel() + 1;
 
    log_rule_B("mod_full_brace_nl");
    const size_t nl_max = options::mod_full_brace_nl();
@@ -530,29 +529,29 @@ static void examine_brace(Chunk *bopen)
    Chunk        *pc = bopen->GetNextNc();
 
    while (  pc->IsNotNullChunk()
-         && pc->level >= level)
+         && pc->GetLevel() >= level)
    {
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
-         LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+         LOG_FMT(LBRDEL, "%s(%d): orig line is %zu, orig col is %zu, <Newline>\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
       }
       else
       {
-         LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+         LOG_FMT(LBRDEL, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
       }
 
-      if (pc->flags.test(PCF_IN_PREPROC))
+      if (pc->TestFlags(PCF_IN_PREPROC))
       {
          // Cannot remove braces that contain a preprocessor
          LOG_FMT(LBRDEL, "%s(%d):  PREPROC\n", __func__, __LINE__);
          return;
       }
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         nl_count += pc->nl_count;
+         nl_count += pc->GetNlCount();
 
          if (  nl_max > 0
             && nl_count > nl_max)
@@ -564,52 +563,52 @@ static void examine_brace(Chunk *bopen)
       }
       else
       {
-         LOG_FMT(LBRDEL, "%s(%d): for pc->Text() '%s', pc->level is %zu,  bopen->level is %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->level, bopen->level);
+         LOG_FMT(LBRDEL, "%s(%d): for pc->Text() '%s', pc->GetLevel() is %zu,  bopen->GetLevel() is %zu\n",
+                 __func__, __LINE__, pc->Text(), pc->GetLevel(), bopen->GetLevel());
 
-         if (  chunk_is_token(pc, CT_BRACE_OPEN)
-            && pc->level == bopen->level)
+         if (  pc->Is(CT_BRACE_OPEN)
+            && pc->GetLevel() == bopen->GetLevel())
          {
             br_count++;
-            LOG_FMT(LBRDEL, "%s(%d): br_count is now %d, pc->level is %zu,  bopen->level is %zu\n",
-                    __func__, __LINE__, br_count, pc->level, bopen->level);
+            LOG_FMT(LBRDEL, "%s(%d): br_count is now %d, pc->GetLevel() is %zu,  bopen->GetLevel() is %zu\n",
+                    __func__, __LINE__, br_count, pc->GetLevel(), bopen->GetLevel());
          }
-         else if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                 && pc->level == bopen->level)
+         else if (  pc->Is(CT_BRACE_CLOSE)
+                 && pc->GetLevel() == bopen->GetLevel())
          {
             if (br_count == 0)
             {
                fprintf(stderr, "%s(%d): br_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col);
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                log_flush(true);
                exit(EX_SOFTWARE);
             }
             br_count--;
-            LOG_FMT(LBRDEL, "%s(%d): br_count is now %d, pc->level is %zu,  bopen->level is %zu\n",
-                    __func__, __LINE__, br_count, pc->level, bopen->level);
+            LOG_FMT(LBRDEL, "%s(%d): br_count is now %d, pc->GetLevel() is %zu,  bopen->GetLevel() is %zu\n",
+                    __func__, __LINE__, br_count, pc->GetLevel(), bopen->GetLevel());
 
             if (br_count == 0)
             {
                Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
                if (  next->IsNullChunk()
-                  || chunk_is_not_token(next, CT_BRACE_CLOSE))
+                  || next->IsNot(CT_BRACE_CLOSE))
                {
                   LOG_FMT(LBRDEL, "%s(%d):  junk after close brace\n", __func__, __LINE__);
                   return;
                }
             }
          }
-         else if (  (  chunk_is_token(pc, CT_IF)
-                    || chunk_is_token(pc, CT_ELSEIF))
+         else if (  (  pc->Is(CT_IF)
+                    || pc->Is(CT_ELSEIF))
                  && br_count == 0)
          {
             if_count++;
          }
-         LOG_FMT(LBRDEL, "%s(%d): pc->level is %zu, level is %zu\n",
-                 __func__, __LINE__, pc->level, level);
+         LOG_FMT(LBRDEL, "%s(%d): pc->GetLevel() is %zu, level is %zu\n",
+                 __func__, __LINE__, pc->GetLevel(), level);
 
-         if (pc->level == level)
+         if (pc->GetLevel() == level)
          {
             if (  semi_count > 0
                && hit_semi)
@@ -618,43 +617,43 @@ static void examine_brace(Chunk *bopen)
                LOG_FMT(LBRDEL, "%s(%d):  no close brace\n", __func__, __LINE__);
                return;
             }
-            LOG_FMT(LBRDEL, "%s(%d): Text() '%s', orig_line is %zu, semi_count is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, semi_count);
+            LOG_FMT(LBRDEL, "%s(%d): Text() '%s', orig line is %zu, semi_count is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), semi_count);
 
-            if (chunk_is_token(pc, CT_ELSE))
+            if (pc->Is(CT_ELSE))
             {
                LOG_FMT(LBRDEL, "%s(%d):  bailed on '%s' on line %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line);
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine());
                return;
             }
 
             if (prev->IsNotNullChunk())
             {
-               LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', prev->Text '%s', prev->type %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), prev->Text(), get_token_name(prev->type));
+               LOG_FMT(LBRDEL, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', prev->Text '%s', prev->GetType() %s\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), prev->Text(), get_token_name(prev->GetType()));
             }
             else
             {
-               LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', prev is a null chunk\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+               LOG_FMT(LBRDEL, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', prev is a null chunk\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
             }
-            LOG_FMT(LBRDEL, "%s(%d): for pc->Text() '%s', pc->level is %zu,  bopen->level is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->level, bopen->level);
-
-            if (  chunk_is_semicolon(pc)
-               || chunk_is_token(pc, CT_IF)
-               || chunk_is_token(pc, CT_ELSEIF)
-               || chunk_is_token(pc, CT_FOR)
-               || chunk_is_token(pc, CT_DO)
-               || chunk_is_token(pc, CT_WHILE)
-               || chunk_is_token(pc, CT_SWITCH)
-               || chunk_is_token(pc, CT_USING_STMT)
-               || (  chunk_is_token(pc, CT_BRACE_OPEN)
-                  && pc->level == bopen->level)) // Issue #1758
+            LOG_FMT(LBRDEL, "%s(%d): for pc->Text() '%s', pc->GetLevel() is %zu,  bopen->GetLevel() is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetLevel(), bopen->GetLevel());
+
+            if (  pc->IsSemicolon()
+               || pc->Is(CT_IF)
+               || pc->Is(CT_ELSEIF)
+               || pc->Is(CT_FOR)
+               || pc->Is(CT_DO)
+               || pc->Is(CT_WHILE)
+               || pc->Is(CT_SWITCH)
+               || pc->Is(CT_USING_STMT)
+               || (  pc->Is(CT_BRACE_OPEN)
+                  && pc->GetLevel() == bopen->GetLevel())) // Issue #1758
             {
-               LOG_FMT(LBRDEL, "%s(%d): pc->Text() '%s', orig_line is %zu, orig_col is %zu, level is %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->level);
-               hit_semi |= chunk_is_semicolon(pc);
+               LOG_FMT(LBRDEL, "%s(%d): pc->Text() '%s', orig line is %zu, orig col is %zu, level is %zu\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
+               hit_semi |= pc->IsSemicolon();
                semi_count++;
                LOG_FMT(LBRDEL, "%s(%d): semi_count is %zu\n",
                        __func__, __LINE__, semi_count);
@@ -662,7 +661,7 @@ static void examine_brace(Chunk *bopen)
                if (semi_count > 1)
                {
                   LOG_FMT(LBRDEL, "%s(%d):  bailed on %zu because of '%s' on line %zu\n",
-                          __func__, __LINE__, bopen->orig_line, pc->Text(), pc->orig_line);
+                          __func__, __LINE__, bopen->GetOrigLine(), pc->Text(), pc->GetOrigLine());
                   return;
                }
             }
@@ -672,34 +671,34 @@ static void examine_brace(Chunk *bopen)
       pc   = pc->GetNext();                  // Issue #1907
    }
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       LOG_FMT(LBRDEL, "%s(%d): pc is nullptr\n", __func__, __LINE__);
       return;
    }
    LOG_FMT(LBRDEL, "%s(%d):  - end on '%s' on line %zu. if_count is %zu, semi_count is %zu\n",
-           __func__, __LINE__, get_token_name(pc->type), pc->orig_line, if_count, semi_count);
+           __func__, __LINE__, get_token_name(pc->GetType()), pc->GetOrigLine(), if_count, semi_count);
 
-   if (chunk_is_token(pc, CT_BRACE_CLOSE))
+   if (pc->Is(CT_BRACE_CLOSE))
    {
       Chunk *next = pc->GetNextNcNnl();
 
       if (next->IsNotNullChunk())
       {
-         while (chunk_is_token(next, CT_VBRACE_CLOSE))
+         while (next->Is(CT_VBRACE_CLOSE))
          {
             next = next->GetNextNcNnl();
          }
 
          if (next->IsNotNullChunk())
          {
-            LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, next is '%s'\n",
-                    __func__, __LINE__, next->orig_line, next->orig_col, get_token_name(next->type));
+            LOG_FMT(LBRDEL, "%s(%d): orig line is %zu, orig col is %zu, next is '%s'\n",
+                    __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), get_token_name(next->GetType()));
          }
 
          if (  if_count > 0
-            && (  chunk_is_token(next, CT_ELSE)
-               || chunk_is_token(next, CT_ELSEIF)))
+            && (  next->Is(CT_ELSE)
+               || next->Is(CT_ELSEIF)))
          {
             LOG_FMT(LBRDEL, "%s(%d):  bailed on because 'else' is next and %zu ifs\n",
                     __func__, __LINE__, if_count);
@@ -711,21 +710,21 @@ static void examine_brace(Chunk *bopen)
 
       if (semi_count > 0)
       {
-         LOG_FMT(LBRDEL, "%s(%d): bopen->parent_type is %s\n",
-                 __func__, __LINE__, get_token_name(get_chunk_parent_type(bopen)));
+         LOG_FMT(LBRDEL, "%s(%d): bopen->GetParentType() is %s\n",
+                 __func__, __LINE__, get_token_name(bopen->GetParentType()));
 
-         if (get_chunk_parent_type(bopen) == CT_ELSE)
+         if (bopen->GetParentType() == CT_ELSE)
          {
             Chunk *tmp_next = bopen->GetNextNcNnl();
 
-            if (chunk_is_token(tmp_next, CT_IF))
+            if (tmp_next->Is(CT_IF))
             {
                Chunk *tmp_prev = bopen->GetPrevNcNnl();
                LOG_FMT(LBRDEL, "%s(%d):  else-if removing braces on line %zu and %zu\n",
-                       __func__, __LINE__, bopen->orig_line, pc->orig_line);
+                       __func__, __LINE__, bopen->GetOrigLine(), pc->GetOrigLine());
 
-               chunk_del(bopen);
-               chunk_del(pc);
+               Chunk::Delete(bopen);
+               Chunk::Delete(pc);
                newline_del_between(tmp_prev, tmp_next);
 
                log_rule_B("nl_else_if");
@@ -741,7 +740,7 @@ static void examine_brace(Chunk *bopen)
          LOG_FMT(LBRDEL, "%s(%d): we have a pair of braces with only 1 statement inside\n",
                  __func__, __LINE__);
          LOG_FMT(LBRDEL, "%s(%d): removing braces on line %zu and %zu\n",
-                 __func__, __LINE__, bopen->orig_line, pc->orig_line);
+                 __func__, __LINE__, bopen->GetOrigLine(), pc->GetOrigLine());
          convert_brace(bopen);
          convert_brace(pc);
       }
@@ -763,16 +762,16 @@ static void convert_brace(Chunk *br)
    LOG_FUNC_ENTRY();
 
    if (  br == nullptr
-      || br->flags.test(PCF_KEEP_BRACE))
+      || br->TestFlags(PCF_KEEP_BRACE))
    {
       return;
    }
    Chunk *tmp;
 
-   if (chunk_is_token(br, CT_BRACE_OPEN))
+   if (br->Is(CT_BRACE_OPEN))
    {
-      set_chunk_type(br, CT_VBRACE_OPEN);
-      br->str.clear();
+      br->SetType(CT_VBRACE_OPEN);
+      br->Str().clear();
       tmp = br->GetPrev();
 
       if (tmp->IsNullChunk())
@@ -780,10 +779,10 @@ static void convert_brace(Chunk *br)
          return;
       }
    }
-   else if (chunk_is_token(br, CT_BRACE_CLOSE))
+   else if (br->Is(CT_BRACE_CLOSE))
    {
-      set_chunk_type(br, CT_VBRACE_CLOSE);
-      br->str.clear();
+      br->SetType(CT_VBRACE_CLOSE);
+      br->Str().clear();
       tmp = br->GetNext();
 
       if (tmp->IsNullChunk())
@@ -796,15 +795,15 @@ static void convert_brace(Chunk *br)
       return;
    }
 
-   if (chunk_is_newline(tmp))
+   if (tmp->IsNewline())
    {
-      if (tmp->nl_count > 1)
+      if (tmp->GetNlCount() > 1)
       {
-         if (!br->flags.test(PCF_ONE_LINER)) // Issue #2232
+         if (!br->TestFlags(PCF_ONE_LINER)) // Issue #2232
          {
-            tmp->nl_count--;
-            LOG_FMT(LBRDEL, "%s(%d): tmp->nl_count is %zu\n",
-                    __func__, __LINE__, tmp->nl_count);
+            tmp->SetNlCount(tmp->GetNlCount() - 1);
+            LOG_FMT(LBRDEL, "%s(%d): tmp new line count is %zu\n",
+                    __func__, __LINE__, tmp->GetNlCount());
          }
       }
       else
@@ -813,27 +812,27 @@ static void convert_brace(Chunk *br)
          // look for opening brace
          Chunk *brace = Chunk::NullChunkPtr;
 
-         if (chunk_is_token(br, CT_VBRACE_OPEN))
+         if (br->Is(CT_VBRACE_OPEN))
          {
             brace = tmp;
          }
-         else if (chunk_is_token(br, CT_VBRACE_CLOSE))
+         else if (br->Is(CT_VBRACE_CLOSE))
          {
-            brace = chunk_skip_to_match_rev(br);
+            brace = br->GetOpeningParen();
 
             if (brace->IsNullChunk())
             {
-               brace = br->GetPrevType(CT_BRACE_OPEN, br->level);
+               brace = br->GetPrevType(CT_BRACE_OPEN, br->GetLevel());
             }
          }
 
-         if (  chunk_is_token(br, CT_VBRACE_OPEN)
-            || (  chunk_is_token(br, CT_VBRACE_CLOSE)
-               && brace->orig_line < tmp->orig_line))
+         if (  br->Is(CT_VBRACE_OPEN)
+            || (  br->Is(CT_VBRACE_CLOSE)
+               && brace->GetOrigLine() < tmp->GetOrigLine()))
          {
-            if (chunk_safe_to_del_nl(tmp))
+            if (tmp->SafeToDeleteNl())
             {
-               chunk_del(tmp);
+               Chunk::Delete(tmp);
             }
          }
       }
@@ -850,10 +849,10 @@ static void convert_vbrace(Chunk *vbr)
       return;
    }
 
-   if (chunk_is_token(vbr, CT_VBRACE_OPEN))
+   if (vbr->Is(CT_VBRACE_OPEN))
    {
-      set_chunk_type(vbr, CT_BRACE_OPEN);
-      vbr->str = "{";
+      vbr->SetType(CT_BRACE_OPEN);
+      vbr->Str() = "{";
 
       /*
        * If the next chunk is a preprocessor, then move the open brace after the
@@ -861,32 +860,34 @@ static void convert_vbrace(Chunk *vbr)
        */
       Chunk *tmp = vbr->GetNext();
 
-      if (chunk_is_token(tmp, CT_PREPROC))
+      if (tmp->Is(CT_PREPROC))
       {
          tmp = vbr->GetNext(E_Scope::PREPROC);
-         chunk_move_after(vbr, tmp);
+         vbr->MoveAfter(tmp);
          newline_add_after(vbr);
       }
    }
-   else if (chunk_is_token(vbr, CT_VBRACE_CLOSE))
+   else if (vbr->Is(CT_VBRACE_CLOSE))
    {
-      set_chunk_type(vbr, CT_BRACE_CLOSE);
-      vbr->str = "}";
+      vbr->SetType(CT_BRACE_CLOSE);
+      vbr->Str() = "}";
 
       /*
        * If the next chunk is a comment, followed by a newline, then
        * move the brace after the newline and add another newline after
-       * the close brace.
+       * the close brace, unless we're keeping a one-liner.
        */
       Chunk *tmp = vbr->GetNext();
 
-      if (tmp->IsComment())
+      if (  tmp->IsComment()
+         && (  !vbr->TestFlags(PCF_ONE_LINER)
+            || !options::nl_if_leave_one_liners()))
       {
          tmp = tmp->GetNext();
 
-         if (chunk_is_newline(tmp))
+         if (tmp->IsNewline())
          {
-            chunk_move_after(vbr, tmp);
+            vbr->MoveAfter(tmp);
             newline_add_after(vbr);
          }
       }
@@ -894,7 +895,7 @@ static void convert_vbrace(Chunk *vbr)
 } // convert_vbrace
 
 
-static void convert_vbrace_to_brace(void)
+static void convert_vbrace_to_brace()
 {
    LOG_FUNC_ENTRY();
 
@@ -907,28 +908,28 @@ static void convert_vbrace_to_brace(void)
    log_rule_B("mod_full_brace_using");
    log_rule_B("mod_full_brace_function");
 
-   for (Chunk *pc = Chunk::GetHead(); pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (chunk_is_not_token(pc, CT_VBRACE_OPEN))
+      if (pc->IsNot(CT_VBRACE_OPEN))
       {
          continue;
       }
-      auto const in_preproc = pc->flags.test(PCF_IN_PREPROC);
+      auto const in_preproc = pc->TestFlags(PCF_IN_PREPROC);
 
-      if (  (  (  get_chunk_parent_type(pc) == CT_IF
-               || get_chunk_parent_type(pc) == CT_ELSE
-               || get_chunk_parent_type(pc) == CT_ELSEIF)
+      if (  (  (  pc->GetParentType() == CT_IF
+               || pc->GetParentType() == CT_ELSE
+               || pc->GetParentType() == CT_ELSEIF)
             && (options::mod_full_brace_if() & IARF_ADD)
             && !options::mod_full_brace_if_chain())
-         || (  get_chunk_parent_type(pc) == CT_FOR
+         || (  pc->GetParentType() == CT_FOR
             && (options::mod_full_brace_for() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_DO
+         || (  pc->GetParentType() == CT_DO
             && (options::mod_full_brace_do() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_WHILE
+         || (  pc->GetParentType() == CT_WHILE
             && (options::mod_full_brace_while() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_USING_STMT
+         || (  pc->GetParentType() == CT_USING_STMT
             && (options::mod_full_brace_using() & IARF_ADD))
-         || (  get_chunk_parent_type(pc) == CT_FUNC_DEF
+         || (  pc->GetParentType() == CT_FUNC_DEF
             && (options::mod_full_brace_function() & IARF_ADD)))
       {
          // Find the matching vbrace close
@@ -938,16 +939,16 @@ static void convert_vbrace_to_brace(void)
          while (tmp->IsNotNullChunk())
          {
             if (  in_preproc
-               && !tmp->flags.test(PCF_IN_PREPROC))
+               && !tmp->TestFlags(PCF_IN_PREPROC))
             {
                // Can't leave a preprocessor
                break;
             }
 
-            if (  pc->brace_level == tmp->brace_level
-               && chunk_is_token(tmp, CT_VBRACE_CLOSE)
-               && get_chunk_parent_type(pc) == get_chunk_parent_type(tmp)
-               && ((tmp->flags & PCF_IN_PREPROC) == (pc->flags & PCF_IN_PREPROC)))
+            if (  pc->GetBraceLevel() == tmp->GetBraceLevel()
+               && tmp->Is(CT_VBRACE_CLOSE)
+               && pc->GetParentType() == tmp->GetParentType()
+               && ((tmp->GetFlags() & PCF_IN_PREPROC) == (pc->GetFlags() & PCF_IN_PREPROC)))
             {
                vbc = tmp;
                break;
@@ -974,33 +975,31 @@ Chunk *insert_comment_after(Chunk *ref, E_Token cmt_type,
 
    Chunk new_cmt = *ref;
 
-   new_cmt.prev  = nullptr;
-   new_cmt.next  = nullptr;
-   new_cmt.flags = (ref->flags & PCF_COPY_FLAGS);
-   set_chunk_type(&new_cmt, cmt_type);
-   new_cmt.str.clear();
+   new_cmt.SetFlags(ref->GetFlags() & PCF_COPY_FLAGS);
+   new_cmt.SetType(cmt_type);
+   new_cmt.Str().clear();
 
    if (cmt_type == CT_COMMENT_CPP)
    {
-      new_cmt.str.append("// ");
-      new_cmt.str.append(cmt_text);
+      new_cmt.Str().append("// ");
+      new_cmt.Str().append(cmt_text);
    }
    else
    {
-      if (chunk_is_token(ref, CT_PP_ELSE))
+      if (ref->Is(CT_PP_ELSE))
       {  // make test c/ 02501 stable
-         new_cmt.str.append(" ");
+         new_cmt.Str().append(" ");
       }
-      new_cmt.str.append("/* ");
-      new_cmt.str.append(cmt_text);
-      new_cmt.str.append(" */");
+      new_cmt.Str().append("/* ");
+      new_cmt.Str().append(cmt_text);
+      new_cmt.Str().append(" */");
    }
    // TODO: expand comment type to cover other comment styles?
 
-   new_cmt.column   = ref->column + ref->Len() + 1;
-   new_cmt.orig_col = new_cmt.column;
+   new_cmt.SetColumn(ref->GetColumn() + ref->Len() + 1);
+   new_cmt.SetOrigCol(new_cmt.GetColumn());
 
-   return(chunk_add_after(&new_cmt, ref));
+   return(new_cmt.CopyAndAddAfter(ref));
 }
 
 
@@ -1015,20 +1014,20 @@ static void append_tag_name(unc_text &txt, Chunk *pc)
    // step backwards over all a::b stuff
    while (tmp->IsNotNullChunk())
    {
-      if (  chunk_is_not_token(tmp, CT_DC_MEMBER)
-         && chunk_is_not_token(tmp, CT_MEMBER))
+      if (  tmp->IsNot(CT_DC_MEMBER)
+         && tmp->IsNot(CT_MEMBER))
       {
          break;
       }
       tmp = tmp->GetPrevNcNnl();
       pc  = tmp;
 
-      if (!chunk_is_word(tmp))
+      if (!tmp->IsWord())
       {
          break;
       }
    }
-   txt += pc->str;
+   txt += pc->GetStr();
    LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
            __func__, __LINE__, txt.c_str());
 
@@ -1036,19 +1035,19 @@ static void append_tag_name(unc_text &txt, Chunk *pc)
 
    while (pc->IsNotNullChunk())
    {
-      if (  chunk_is_not_token(pc, CT_DC_MEMBER)
-         && chunk_is_not_token(pc, CT_MEMBER))
+      if (  pc->IsNot(CT_DC_MEMBER)
+         && pc->IsNot(CT_MEMBER))
       {
          break;
       }
-      txt += pc->str;
+      txt += pc->GetStr();
       LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
               __func__, __LINE__, txt.c_str());
       pc = pc->GetNextNcNnl();
 
       if (pc->IsNotNullChunk())
       {
-         txt += pc->str;
+         txt += pc->GetStr();
          LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
                  __func__, __LINE__, txt.c_str());
       }
@@ -1057,7 +1056,7 @@ static void append_tag_name(unc_text &txt, Chunk *pc)
 } // append_tag_name
 
 
-void add_long_closebrace_comment(void)
+void add_long_closebrace_comment()
 {
    LOG_FUNC_ENTRY();
    Chunk *fcn_pc = Chunk::NullChunkPtr;
@@ -1067,27 +1066,27 @@ void add_long_closebrace_comment(void)
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (  chunk_is_token(pc, CT_FUNC_DEF)
-         || chunk_is_token(pc, CT_OC_MSG_DECL))
+      if (  pc->Is(CT_FUNC_DEF)
+         || pc->Is(CT_OC_MSG_DECL))
       {
          fcn_pc = pc;
       }
-      else if (chunk_is_token(pc, CT_SWITCH))
+      else if (pc->Is(CT_SWITCH))
       {
          // pointless, since it always has the text "switch"
          sw_pc = pc;
       }
-      else if (chunk_is_token(pc, CT_NAMESPACE))
+      else if (pc->Is(CT_NAMESPACE))
       {
          ns_pc = pc;
       }
-      else if (chunk_is_token(pc, CT_CLASS))
+      else if (pc->Is(CT_CLASS))
       {
          cl_pc = pc;
       }
 
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         || pc->flags.test(PCF_IN_PREPROC))
+      if (  pc->IsNot(CT_BRACE_OPEN)
+         || pc->TestFlags(PCF_IN_PREPROC))
       {
          continue;
       }
@@ -1098,15 +1097,15 @@ void add_long_closebrace_comment(void)
 
       while ((tmp = tmp->GetNext(E_Scope::PREPROC))->IsNotNullChunk())
       {
-         if (chunk_is_newline(tmp))
+         if (tmp->IsNewline())
          {
-            nl_count += tmp->nl_count;
+            nl_count += tmp->GetNlCount();
             continue;
          }
 
          // handle only matching closing braces, skip other chunks
-         if (  tmp->level != br_open->level
-            || chunk_is_not_token(tmp, CT_BRACE_CLOSE))
+         if (  tmp->GetLevel() != br_open->GetLevel()
+            || tmp->IsNot(CT_BRACE_CLOSE))
          {
             continue;
          }
@@ -1115,10 +1114,10 @@ void add_long_closebrace_comment(void)
          tmp = tmp->GetNext();
 
          // check for a possible end semicolon
-         if (chunk_is_token(tmp, CT_SEMICOLON))
+         if (tmp->Is(CT_SEMICOLON))
          {
             // set br_close to the semi token,
-            // as br_close is used to add the coment after it
+            // as br_close is used to add the comment after it
             br_close = tmp;
             tmp      = tmp->GetNext();
          }
@@ -1126,7 +1125,7 @@ void add_long_closebrace_comment(void)
          // make sure a newline follows in order to not overwrite an already
          // existring comment
          if (  tmp->IsNotNullChunk()
-            && !chunk_is_newline(tmp))
+            && !tmp->IsNewline())
          {
             break;
          }
@@ -1134,8 +1133,8 @@ void add_long_closebrace_comment(void)
          Chunk    *tag_pc = Chunk::NullChunkPtr;
          unc_text xstr;
 
-         if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
-            || get_chunk_parent_type(br_open) == CT_OC_MSG_DECL)
+         if (  br_open->GetParentType() == CT_FUNC_DEF
+            || br_open->GetParentType() == CT_OC_MSG_DECL)
          {
             log_rule_B("mod_add_long_function_closebrace_comment");
             nl_min = options::mod_add_long_function_closebrace_comment();
@@ -1148,23 +1147,23 @@ void add_long_closebrace_comment(void)
                        __func__, __LINE__, xstr.c_str());
             }
          }
-         else if (  get_chunk_parent_type(br_open) == CT_SWITCH
+         else if (  br_open->GetParentType() == CT_SWITCH
                  && sw_pc != nullptr)
          {
             log_rule_B("mod_add_long_switch_closebrace_comment");
             nl_min = options::mod_add_long_switch_closebrace_comment();
             tag_pc = sw_pc;
-            xstr   = sw_pc->str;
+            xstr   = sw_pc->GetStr();
             LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
                     __func__, __LINE__, xstr.c_str());
          }
-         else if (  get_chunk_parent_type(br_open) == CT_NAMESPACE
+         else if (  br_open->GetParentType() == CT_NAMESPACE
                  && ns_pc != nullptr)
          {
             log_rule_B("mod_add_long_namespace_closebrace_comment");
             nl_min = options::mod_add_long_namespace_closebrace_comment();
             tag_pc = ns_pc;
-            xstr   = tag_pc->str;    // add 'namespace' to the string
+            xstr   = tag_pc->GetStr();    // add 'namespace' to the string
             LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
                     __func__, __LINE__, xstr.c_str());
 
@@ -1172,7 +1171,7 @@ void add_long_closebrace_comment(void)
             // append it with a space to generate "namespace xyz"
             Chunk *tmp_next = tag_pc->GetNextNcNnl();
 
-            if (chunk_is_not_token(tmp_next, CT_BRACE_OPEN)) // anonymous namespace -> ignore
+            if (tmp_next->IsNot(CT_BRACE_OPEN)) // anonymous namespace -> ignore
             {
                xstr.append(" ");
                LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
@@ -1182,15 +1181,15 @@ void add_long_closebrace_comment(void)
                        __func__, __LINE__, xstr.c_str());
             }
          }
-         else if (  get_chunk_parent_type(br_open) == CT_CLASS
+         else if (  br_open->GetParentType() == CT_CLASS
                  && cl_pc->IsNotNullChunk()
-                 && (  !language_is_set(LANG_CPP)               // proceed if not C++
-                    || chunk_is_token(br_close, CT_SEMICOLON))) // else a C++ class needs to end with a semicolon
+                 && (  !language_is_set(LANG_CPP)   // proceed if not C++
+                    || br_close->Is(CT_SEMICOLON))) // else a C++ class needs to end with a semicolon
          {
             log_rule_B("mod_add_long_class_closebrace_comment");
             nl_min = options::mod_add_long_class_closebrace_comment();
             tag_pc = cl_pc;
-            xstr   = tag_pc->str;
+            xstr   = tag_pc->GetStr();
             LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
                     __func__, __LINE__, xstr.c_str());
 
@@ -1226,47 +1225,47 @@ void add_long_closebrace_comment(void)
 } // add_long_closebrace_comment
 
 
-static void move_case_break(void)
+static void move_case_break()
 {
    LOG_FUNC_ENTRY();
    Chunk *prev = Chunk::NullChunkPtr;
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (  chunk_is_token(pc, CT_BREAK)
-         && chunk_is_token(prev, CT_BRACE_CLOSE)
-         && get_chunk_parent_type(prev) == CT_CASE
-         && chunk_is_newline(pc->GetPrev())
-         && chunk_is_newline(prev->GetPrev()))
+      if (  pc->Is(CT_BREAK)
+         && prev->Is(CT_BRACE_CLOSE)
+         && prev->GetParentType() == CT_CASE
+         && pc->GetPrev()->IsNewline()
+         && prev->GetPrev()->IsNewline())
       {
-         chunk_swap_lines(prev, pc);
+         prev->SwapLines(pc);
       }
       prev = pc;
    }
 }
 
 
-static void move_case_return(void)
+static void move_case_return()
 {
    LOG_FUNC_ENTRY();
    Chunk *prev = Chunk::NullChunkPtr;
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (  chunk_is_token(pc, CT_RETURN)
-         && chunk_is_token(prev, CT_BRACE_CLOSE)
-         && get_chunk_parent_type(prev) == CT_CASE
-         && chunk_is_newline(pc->GetPrev())
-         && chunk_is_newline(prev->GetPrev()))
+      if (  pc->Is(CT_RETURN)
+         && prev->Is(CT_BRACE_CLOSE)
+         && prev->GetParentType() == CT_CASE
+         && pc->GetPrev()->IsNewline()
+         && prev->GetPrev()->IsNewline())
       {
          // Find the end of the return statement
-         while (chunk_is_not_token(pc, CT_SEMICOLON))
+         while (pc->IsNot(CT_SEMICOLON))
          {
-            if (  chunk_is_token(pc, CT_CASE)
-               || chunk_is_token(pc, CT_BRACE_CLOSE))
+            if (  pc->Is(CT_CASE)
+               || pc->Is(CT_BRACE_CLOSE))
             {
                // This may indicate a semicolon was missing in the code to format.
-               // Avoid moving the return statement to prevent potential unwanted erros.
+               // Avoid moving the return statement to prevent potential unwanted errors.
                pc = Chunk::NullChunkPtr;
                break;
             }
@@ -1279,12 +1278,12 @@ static void move_case_return(void)
          {
             // Swap all lines between brace close and current token
             LOG_FMT(LMCB, "%s(%d): move line %zu before line %zu\n",
-                    __func__, __LINE__, prev->orig_line, pc->orig_line);
+                    __func__, __LINE__, prev->GetOrigLine(), pc->GetOrigLine());
             Chunk *curr = prev->GetNextNcNnl();
 
             while (curr != pc)
             {
-               chunk_swap_lines(prev, curr);
+               prev->SwapLines(curr);
                curr = prev->GetNextNcNnl();
             }
          }
@@ -1298,11 +1297,11 @@ static Chunk *mod_case_brace_remove(Chunk *br_open)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LMCB, "%s(%d): line %zu",
-           __func__, __LINE__, br_open->orig_line);
+           __func__, __LINE__, br_open->GetOrigLine());
 
    // Find the matching brace close
    Chunk *next     = br_open->GetNextNcNnl(E_Scope::PREPROC);
-   Chunk *br_close = br_open->GetNextType(CT_BRACE_CLOSE, br_open->level, E_Scope::PREPROC);
+   Chunk *br_close = br_open->GetNextType(CT_BRACE_CLOSE, br_open->GetLevel(), E_Scope::PREPROC);
 
    if (br_close->IsNullChunk())
    {
@@ -1313,14 +1312,14 @@ static Chunk *mod_case_brace_remove(Chunk *br_open)
    Chunk *pc = br_close->GetNextNcNnl(E_Scope::PREPROC);
 
    if (  pc->IsNullChunk()
-      || (  chunk_is_not_token(pc, CT_BREAK)
-         && chunk_is_not_token(pc, CT_RETURN)
-         && chunk_is_not_token(pc, CT_CASE)
-         && chunk_is_not_token(pc, CT_GOTO)
-         && chunk_is_not_token(pc, CT_BRACE_CLOSE)))
+      || (  pc->IsNot(CT_BREAK)
+         && pc->IsNot(CT_RETURN)
+         && pc->IsNot(CT_CASE)
+         && pc->IsNot(CT_GOTO)
+         && pc->IsNot(CT_BRACE_CLOSE)))
    {
       LOG_FMT(LMCB, "%s(%d):  - after '%s'\n",
-              __func__, __LINE__, (pc == nullptr) ? "<null>" : get_token_name(pc->type));
+              __func__, __LINE__, (pc == nullptr) ? "<null>" : get_token_name(pc->GetType()));
       return(next);
    }
 
@@ -1329,45 +1328,45 @@ static Chunk *mod_case_brace_remove(Chunk *br_open)
         tmp_pc != br_close;
         tmp_pc = tmp_pc->GetNextNcNnl(E_Scope::PREPROC))
    {
-      if (  tmp_pc->level == (br_open->level + 1)
-         && tmp_pc->flags.test(PCF_VAR_DEF))
+      if (  tmp_pc->GetLevel() == (br_open->GetLevel() + 1)
+         && tmp_pc->TestFlags(PCF_VAR_DEF))
       {
          LOG_FMT(LMCB, "%s(%d):  - vardef on line %zu: '%s'\n",
-                 __func__, __LINE__, tmp_pc->orig_line, pc->Text());
+                 __func__, __LINE__, tmp_pc->GetOrigLine(), pc->Text());
          return(next);
       }
    }
 
    LOG_FMT(LMCB, "%s(%d):  - removing braces on lines %zu and %zu\n",
-           __func__, __LINE__, br_open->orig_line, br_close->orig_line);
+           __func__, __LINE__, br_open->GetOrigLine(), br_close->GetOrigLine());
 
    for (Chunk *tmp_pc = br_open;
         tmp_pc != br_close;
         tmp_pc = tmp_pc->GetNextNcNnl(E_Scope::PREPROC))
    {
-      if (tmp_pc->brace_level == 0)
+      if (tmp_pc->GetBraceLevel() == 0)
       {
-         fprintf(stderr, "%s(%d): tmp_pc->brace_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                 __func__, __LINE__, tmp_pc->orig_line, tmp_pc->orig_col);
+         fprintf(stderr, "%s(%d): brace level is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                 __func__, __LINE__, tmp_pc->GetOrigLine(), tmp_pc->GetOrigCol());
          log_flush(true);
          exit(EX_SOFTWARE);
       }
-      tmp_pc->brace_level--;
+      tmp_pc->SetBraceLevel(tmp_pc->GetBraceLevel() - 1);
 
-      if (tmp_pc->level == 0)
+      if (tmp_pc->GetLevel() == 0)
       {
-         fprintf(stderr, "%s(%d): tmp_pc->level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                 __func__, __LINE__, tmp_pc->orig_line, tmp_pc->orig_col);
+         fprintf(stderr, "%s(%d): tmp_pc->GetLevel() is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                 __func__, __LINE__, tmp_pc->GetOrigLine(), tmp_pc->GetOrigCol());
          log_flush(true);
          exit(EX_SOFTWARE);
       }
-      tmp_pc->level--;
+      tmp_pc->SetLevel(tmp_pc->GetLevel() - 1);
    }
 
    next = br_open->GetPrev(E_Scope::PREPROC);
 
-   chunk_del(br_open);
-   chunk_del(br_close);
+   Chunk::Delete(br_open);
+   Chunk::Delete(br_close);
 
    return(next->GetNext(E_Scope::PREPROC));
 } // mod_case_brace_remove
@@ -1376,48 +1375,48 @@ static Chunk *mod_case_brace_remove(Chunk *br_open)
 static Chunk *mod_case_brace_add(Chunk *cl_colon)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LMCB, "%s(%d): orig_line %zu, orig_col is %zu\n",
-           __func__, __LINE__, cl_colon->orig_line, cl_colon->orig_col);
+   LOG_FMT(LMCB, "%s(%d): orig line %zu, orig col is %zu\n",
+           __func__, __LINE__, cl_colon->GetOrigLine(), cl_colon->GetOrigCol());
 
    Chunk *pc   = cl_colon;
    Chunk *last = Chunk::NullChunkPtr;
    // look for the case token to the colon
-   Chunk *cas_ = cl_colon->GetPrevType(CT_CASE, cl_colon->level);
+   Chunk *cas_ = cl_colon->GetPrevType(CT_CASE, cl_colon->GetLevel());
    // look for the parent
-   Chunk *swit = cas_->parent;
+   Chunk *swit = cas_->GetParent();
    // look for the opening brace of the switch
-   Chunk *open = swit->GetNextType(CT_BRACE_OPEN, swit->level);
+   Chunk *open = swit->GetNextType(CT_BRACE_OPEN, swit->GetLevel());
    // look for the closing brace of the switch
-   Chunk *clos = chunk_skip_to_match(open);
+   Chunk *clos = open->GetClosingParen();
 
    // find the end of the case-block
    pc = pc->GetNextNcNnl(E_Scope::PREPROC);
 
    while (pc->IsNotNullChunk())
    {
-      LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu, pp_level is %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->pp_level);
+      LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig line %zu, orig col is %zu, pp level is %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetPpLevel());
 
-      if (pc->level == cl_colon->level)
+      if (pc->GetLevel() == cl_colon->GetLevel())
       {
-         if (chunk_is_token(pc, CT_CASE))
+         if (pc->Is(CT_CASE))
          {
-            LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+            LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig line %zu, orig col is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
             last = calculate_closing_brace_position(cl_colon, pc);
             break;
          }
       }
-      else if (pc->level == cl_colon->level - 1)
+      else if (pc->GetLevel() == cl_colon->GetLevel() - 1)
       {
          if (pc == clos)
          {
-            LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+            LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig line %zu, orig col is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
             // end of switch is reached
             last = calculate_closing_brace_position(cl_colon, pc);
-            LOG_FMT(LMCB, "%s(%d): last->Text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
+            LOG_FMT(LMCB, "%s(%d): last->Text() is '%s', orig line %zu, orig col is %zu\n",
+                    __func__, __LINE__, last->Text(), last->GetOrigLine(), last->GetOrigCol());
             break;
          }
       }
@@ -1430,43 +1429,43 @@ static Chunk *mod_case_brace_add(Chunk *cl_colon)
       Chunk *next = cl_colon->GetNextNcNnl(E_Scope::PREPROC);
       return(next);
    }
-   LOG_FMT(LMCB, "%s(%d): last->Text() is '%s', orig_line %zu, orig_col is %zu\n",
-           __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
+   LOG_FMT(LMCB, "%s(%d): last->Text() is '%s', orig line %zu, orig col is %zu\n",
+           __func__, __LINE__, last->Text(), last->GetOrigLine(), last->GetOrigCol());
    LOG_FMT(LMCB, "%s(%d): adding braces after '%s' on line %zu\n",
-           __func__, __LINE__, cl_colon->Text(), cl_colon->orig_line);
+           __func__, __LINE__, cl_colon->Text(), cl_colon->GetOrigLine());
 
    Chunk chunk;
 
-   set_chunk_type(&chunk, CT_BRACE_OPEN);
-   set_chunk_parent(&chunk, CT_CASE);
-   chunk.orig_line   = cl_colon->orig_line;
-   chunk.orig_col    = cl_colon->orig_col;
-   chunk.level       = cl_colon->level;
-   chunk.pp_level    = cl_colon->pp_level;
-   chunk.brace_level = cl_colon->brace_level;
-   chunk.flags       = pc->flags & PCF_COPY_FLAGS;
-   chunk.str         = "{";
-   Chunk *br_open = chunk_add_after(&chunk, cl_colon);
-
-   set_chunk_type(&chunk, CT_BRACE_CLOSE);
-   chunk.orig_line = last->orig_line;
-   chunk.orig_col  = last->orig_col;
-   chunk.str       = "}";
-   Chunk *br_close = chunk_add_after(&chunk, last);
+   chunk.SetType(CT_BRACE_OPEN);
+   chunk.SetParentType(CT_CASE);
+   chunk.SetOrigLine(cl_colon->GetOrigLine());
+   chunk.SetOrigCol(cl_colon->GetOrigCol());
+   chunk.SetLevel(cl_colon->GetLevel());
+   chunk.SetPpLevel(cl_colon->GetPpLevel());
+   chunk.SetBraceLevel(cl_colon->GetBraceLevel());
+   chunk.SetFlags(pc->GetFlags() & PCF_COPY_FLAGS);
+   chunk.Str() = "{";
+   Chunk *br_open = chunk.CopyAndAddAfter(cl_colon);
+
+   chunk.SetType(CT_BRACE_CLOSE);
+   chunk.SetOrigLine(last->GetOrigLine());
+   chunk.SetOrigCol(last->GetOrigCol());
+   chunk.Str() = "}";
+   Chunk *br_close = chunk.CopyAndAddAfter(last);
 
    for (pc = br_open->GetNext(E_Scope::PREPROC);
         pc != br_close;
         pc = pc->GetNext(E_Scope::PREPROC))
    {
-      pc->level++;
-      pc->brace_level++;
+      pc->SetLevel(pc->GetLevel() + 1);
+      pc->SetBraceLevel(pc->GetBraceLevel() + 1);
    }
 
    return(br_open);
 } // mod_case_brace_add
 
 
-static void mod_case_brace(void)
+static void mod_case_brace()
 {
    LOG_FUNC_ENTRY();
 
@@ -1490,17 +1489,17 @@ static void mod_case_brace(void)
       log_rule_B("mod_case_brace");
 
       if (  options::mod_case_brace() == IARF_REMOVE
-         && chunk_is_token(pc, CT_BRACE_OPEN)
-         && get_chunk_parent_type(pc) == CT_CASE)
+         && pc->Is(CT_BRACE_OPEN)
+         && pc->GetParentType() == CT_CASE)
       {
          log_rule_B("mod_case_brace - add");
          pc = mod_case_brace_remove(pc);
       }
       else if (  (options::mod_case_brace() & IARF_ADD)
-              && chunk_is_token(pc, CT_CASE_COLON)
-              && chunk_is_not_token(next, CT_BRACE_OPEN)
-              && chunk_is_not_token(next, CT_BRACE_CLOSE)
-              && chunk_is_not_token(next, CT_CASE))
+              && pc->Is(CT_CASE_COLON)
+              && next->IsNot(CT_BRACE_OPEN)
+              && next->IsNot(CT_BRACE_CLOSE)
+              && next->IsNot(CT_CASE))
       {
          log_rule_B("mod_case_brace - remove");
          pc = mod_case_brace_add(pc);
@@ -1516,8 +1515,8 @@ static void mod_case_brace(void)
 static void process_if_chain(Chunk *br_start)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LBRCH, "%s(%d): if starts on line %zu, orig_col is %zu.\n",
-           __func__, __LINE__, br_start->orig_line, br_start->orig_col);
+   LOG_FMT(LBRCH, "%s(%d): if starts on line %zu, orig col is %zu.\n",
+           __func__, __LINE__, br_start->GetOrigLine(), br_start->GetOrigCol());
 
    vector<Chunk *> braces;
 
@@ -1528,17 +1527,17 @@ static void process_if_chain(Chunk *br_start)
 
    Chunk *pc = br_start;
 
-   while (pc != nullptr)
+   while (  pc != nullptr
+         && pc->IsNotNullChunk())
    {
-      LOG_FMT(LBRCH, "%s(%d): pc->Text() is '%s', orig_line is %zu, orig_col is %zu.\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+      LOG_CHUNK(LTOK, pc);
 
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
+      if (pc->Is(CT_BRACE_OPEN))
       {
          const bool tmp = can_remove_braces(pc);
          LOG_FMT(LBRCH, "%s(%d): braces.size() is %zu, line is %zu, - can%s remove %s\n",
-                 __func__, __LINE__, braces.size(), pc->orig_line, tmp ? "" : "not",
-                 get_token_name(pc->type));
+                 __func__, __LINE__, braces.size(), pc->GetOrigLine(), tmp ? "" : "not",
+                 get_token_name(pc->GetType()));
 
          if (  !tmp
             || options::mod_full_brace_if_chain() == 2)
@@ -1555,8 +1554,8 @@ static void process_if_chain(Chunk *br_start)
             must_have_braces = true;
          }
          LOG_FMT(LBRCH, "%s(%d): braces.size() is %zu, line is %zu, - %s %s\n",
-                 __func__, __LINE__, braces.size(), pc->orig_line, tmp ? "should add" : "ignore",
-                 get_token_name(pc->type));
+                 __func__, __LINE__, braces.size(), pc->GetOrigLine(), tmp ? "should add" : "ignore",
+                 get_token_name(pc->GetType()));
 
          has_unbraced_block = true;
       }
@@ -1567,9 +1566,9 @@ static void process_if_chain(Chunk *br_start)
          must_have_braces = true;
       }
       braces.push_back(pc);
-      Chunk *br_close = chunk_skip_to_match(pc, E_Scope::PREPROC);
+      Chunk *br_close = pc->GetClosingParen(E_Scope::PREPROC);
 
-      if (br_close == nullptr)
+      if (br_close->IsNullChunk())
       {
          break;
       }
@@ -1578,7 +1577,7 @@ static void process_if_chain(Chunk *br_start)
       pc = br_close->GetNextNcNnl(E_Scope::PREPROC);
 
       if (  pc->IsNullChunk()
-         || chunk_is_not_token(pc, CT_ELSE))
+         || pc->IsNot(CT_ELSE))
       {
          break;
       }
@@ -1591,10 +1590,10 @@ static void process_if_chain(Chunk *br_start)
       }
       pc = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-      if (chunk_is_token(pc, CT_ELSEIF))
+      if (pc->Is(CT_ELSEIF))
       {
-         while (  chunk_is_not_token(pc, CT_VBRACE_OPEN)
-               && chunk_is_not_token(pc, CT_BRACE_OPEN))
+         while (  pc->IsNot(CT_VBRACE_OPEN)
+               && pc->IsNot(CT_BRACE_OPEN))
          {
             pc = pc->GetNextNcNnl(E_Scope::PREPROC);
          }
@@ -1605,8 +1604,8 @@ static void process_if_chain(Chunk *br_start)
          break;
       }
 
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && chunk_is_not_token(pc, CT_VBRACE_OPEN))
+      if (  pc->IsNot(CT_BRACE_OPEN)
+         && pc->IsNot(CT_VBRACE_OPEN))
       {
          break;
       }
@@ -1623,19 +1622,18 @@ static void process_if_chain(Chunk *br_start)
       {
          const auto brace = *itc;
 
-         chunk_flags_set(brace, PCF_KEEP_BRACE);
+         brace->SetFlagBits(PCF_KEEP_BRACE);
 
-         if (  chunk_is_token(brace, CT_VBRACE_OPEN)
-            || chunk_is_token(brace, CT_VBRACE_CLOSE))
+         if (brace->IsVBrace())
          {
             LOG_FMT(LBRCH, "%s(%d):  %zu",
-                    __func__, __LINE__, brace->orig_line);
+                    __func__, __LINE__, brace->GetOrigLine());
             convert_vbrace(brace);
          }
          else
          {
             LOG_FMT(LBRCH, "%s(%d):  {%zu}",
-                    __func__, __LINE__, brace->orig_line);
+                    __func__, __LINE__, brace->GetOrigLine());
          }
       }
 
@@ -1665,34 +1663,33 @@ static void process_if_chain(Chunk *br_start)
       {
          const auto brace = *itc;
 
-         if (  (  chunk_is_token(brace, CT_BRACE_OPEN)
-               || chunk_is_token(brace, CT_BRACE_CLOSE))
-            && (get_chunk_parent_type(brace) != CT_BRACED_INIT_LIST)
+         if (  (  brace->Is(CT_BRACE_OPEN)
+               || brace->Is(CT_BRACE_CLOSE))
+            && (brace->GetParentType() != CT_BRACED_INIT_LIST)
             && (multiline_block ? !paren_multiline_before_brace(brace) : true))
          {
-            LOG_FMT(LBRCH, "%s(%d): brace->orig_line is %zu, brace->orig_col is %zu\n",
-                    __func__, __LINE__, brace->orig_line, brace->orig_col);
+            LOG_FMT(LBRCH, "%s(%d): brace orig line is %zu, orig col is %zu\n",
+                    __func__, __LINE__, brace->GetOrigLine(), brace->GetOrigCol());
             convert_brace(brace);
          }
          else
          {
-            LOG_FMT(LBRCH, "%s(%d): brace->orig_line is %zu, brace->orig_col is %zu\n",
-                    __func__, __LINE__, brace->orig_line, brace->orig_col);
+            LOG_FMT(LBRCH, "%s(%d): brace orig line is %zu, orig col is %zu\n",
+                    __func__, __LINE__, brace->GetOrigLine(), brace->GetOrigCol());
          }
       }
    }
 } // process_if_chain
 
 
-static void mod_full_brace_if_chain(void)
+static void mod_full_brace_if_chain()
 {
    LOG_FUNC_ENTRY();
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (  (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_token(pc, CT_VBRACE_OPEN))
-         && get_chunk_parent_type(pc) == CT_IF)
+      if (  pc->IsBraceOpen()
+         && pc->GetParentType() == CT_IF)
       {
          process_if_chain(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.h
index c9695bbe..763b6470 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.h
@@ -13,14 +13,14 @@
 
 
 //! Change virtual braces into real braces
-void do_braces(void);
+void do_braces();
 
 /**
  * See the preprocessor counterpart:
  *   add_long_preprocessor_conditional_block_comment
  * in output.cpp
  */
-void add_long_closebrace_comment(void);
+void add_long_closebrace_comment();
 
 
 /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/calculate_closing_brace_position.cpp
index 30865900..db48a5e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/calculate_closing_brace_position.cpp
@@ -14,10 +14,10 @@ using namespace uncrustify;
 
 Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
 {
-   LOG_FMT(LMCB, "%s(%d): cl_colon->Text() is '%s', orig_line %zu, orig_col is %zu, level is %zu\n",
-           __func__, __LINE__, cl_colon->Text(), cl_colon->orig_line, cl_colon->orig_col, cl_colon->level);
-   LOG_FMT(LMCB, "%s(%d): pc->Text()       is '%s', orig_line %zu, orig_col is %zu, level is %zu\n",
-           __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->level);
+   LOG_FMT(LMCB, "%s(%d): cl_colon->Text() is '%s', orig line %zu, orig col is %zu, level is %zu\n",
+           __func__, __LINE__, cl_colon->Text(), cl_colon->GetOrigLine(), cl_colon->GetOrigCol(), cl_colon->GetLevel());
+   LOG_FMT(LMCB, "%s(%d): pc->Text()       is '%s', orig line %zu, orig col is %zu, level is %zu\n",
+           __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
    // end of block is reached
    // look back over newline, preprocessor BUT NOT #endif
 
@@ -28,13 +28,13 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
 
    size_t check_level = 0;
 
-   if (chunk_is_token(pc, CT_BRACE_CLOSE))
+   if (pc->Is(CT_BRACE_CLOSE))
    {
-      check_level = pc->level + 1;
+      check_level = pc->GetLevel() + 1;
    }
    else
    {
-      check_level = pc->level;
+      check_level = pc->GetLevel();
    }
    size_t erst_found      = 0;
    Chunk  *is_brace_close = Chunk::NullChunkPtr;
@@ -54,24 +54,23 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
          break;
       }
 
-      if (back->level == check_level)
+      if (back->GetLevel() == check_level)
       {
-         if (  chunk_is_token(back, CT_BRACE_CLOSE)
-            || chunk_is_token(back, CT_VBRACE_CLOSE))
+         if (back->IsBraceClose())
          {
             // brace_close found
             is_brace_close = back;
             LOG_FMT(LMCB, "%s(%d): BRACE_CLOSE: line is %zu, col is %zu, level is %zu\n",
-                    __func__, __LINE__, is_brace_close->orig_line, is_brace_close->orig_col, is_brace_close->level);
+                    __func__, __LINE__, is_brace_close->GetOrigLine(), is_brace_close->GetOrigCol(), is_brace_close->GetLevel());
             erst_found = 3;
          }
 
-         if (chunk_is_token(back, CT_SEMICOLON))
+         if (back->Is(CT_SEMICOLON))
          {
             // semicolon found
             is_semicolon = back;
             LOG_FMT(LMCB, "%s(%d): SEMICOLON:   line is %zu, col is %zu, level is %zu\n",
-                    __func__, __LINE__, is_semicolon->orig_line, is_semicolon->orig_col, is_semicolon->level);
+                    __func__, __LINE__, is_semicolon->GetOrigLine(), is_semicolon->GetOrigCol(), is_semicolon->GetLevel());
             erst_found = 4;
          }
 
@@ -80,7 +79,7 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
             // comment found
             is_comment = back;
             LOG_FMT(LMCB, "%s(%d): COMMENT:     line is %zu, col is %zu, level is %zu\n",
-                    __func__, __LINE__, back->orig_line, back->orig_col, back->level);
+                    __func__, __LINE__, back->GetOrigLine(), back->GetOrigCol(), back->GetLevel());
          }
       }
       back = back->GetPrev();
@@ -108,11 +107,11 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
 
          if (second->IsNotNullChunk())
          {
-            if (is_comment->orig_line == second->orig_line)
+            if (is_comment->GetOrigLine() == second->GetOrigLine())
             {
                last = is_comment;
 
-               if (cl_colon->orig_line == is_comment->orig_line)
+               if (cl_colon->GetOrigLine() == is_comment->GetOrigLine())
                {
                   last = is_comment->GetNext();
                }
@@ -143,27 +142,26 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
       exit(EX_SOFTWARE);
    }
 
-   if (chunk_is_token(last, CT_COMMENT_CPP))         // Issue #3058
+   if (last->Is(CT_COMMENT_CPP))         // Issue #3058
    {
       last = last->GetNext();
    }
-   LOG_FMT(LMCB, "%s(%d): last->Text()     is '%s', orig_line %zu, orig_col is %zu\n",
-           __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
+   LOG_FMT(LMCB, "%s(%d): last->Text()     is '%s', orig line %zu, orig col is %zu\n",
+           __func__, __LINE__, last->Text(), last->GetOrigLine(), last->GetOrigCol());
 
    if (last->IsPreproc())
    {
       // we have a preprocessor token
       while (last->IsNotNullChunk())
       {
-         LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
+         LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig line %zu, orig col is %zu\n",
+                 __func__, __LINE__, last->Text(), last->GetOrigLine(), last->GetOrigCol());
 
-         if (chunk_is_token(last, CT_PP_ENDIF))
+         if (last->Is(CT_PP_ENDIF))
          {
-            // look for the parent
-            Chunk *parent_last = last->parent;
-            // compare the positions
-            int   comp = chunk_compare_position(parent_last, cl_colon);
+            // look for the parent and compare the positions
+            Chunk *parent_last = last->GetParent();
+            int   comp         = parent_last->ComparePosition(cl_colon);
             LOG_FMT(LMCB, "%s(%d): comp is %d\n",
                     __func__, __LINE__, comp);
 
@@ -171,23 +169,23 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
             {
                // cl_colon is after parent_last ==>
                // the closing brace will be set before #endif
-               Chunk *pp_start = chunk_get_pp_start(last);
+               Chunk *pp_start = last->GetPpStart();
                last = pp_start->GetPrevNnl();
-               LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
+               LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig line %zu, orig col is %zu\n",
+                       __func__, __LINE__, last->Text(), last->GetOrigLine(), last->GetOrigCol());
             }
             else if (comp == 1)
             {
                // cl_colon is before parent_last ==>
                // the closing brace will be set after #endif
-               LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
+               LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig line %zu, orig col is %zu\n",
+                       __func__, __LINE__, last->Text(), last->GetOrigLine(), last->GetOrigCol());
             }
             break;
          }
          last = last->GetPrevNcNnl();
-         LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
+         LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig line %zu, orig col is %zu\n",
+                 __func__, __LINE__, last->Text(), last->GetOrigLine(), last->GetOrigCol());
 
          if (!last->IsPreproc())
          {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/calculate_closing_brace_position.h
index 6d2b0f06..6d2b0f06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/src/change_int_types.cpp
new file mode 100644
index 00000000..06875edb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/change_int_types.cpp
@@ -0,0 +1,186 @@
+/**
+ * @file change_int_types.cpp
+ *
+ * @author  Alex Henrie
+ * @license GPL v2+
+ */
+
+#include "change_int_types.h"
+
+#include "chunk.h"
+#include "uncrustify.h"
+
+
+using namespace uncrustify;
+
+
+static bool is_storage_keyword(const Chunk *pc)
+{
+   return(  strcmp(pc->Text(), "auto") == 0
+         || strcmp(pc->Text(), "const") == 0
+         || strcmp(pc->Text(), "extern") == 0
+         || strcmp(pc->Text(), "mutable") == 0
+         || strcmp(pc->Text(), "register") == 0
+         || strcmp(pc->Text(), "static") == 0
+         || strcmp(pc->Text(), "thread_local") == 0
+         || strcmp(pc->Text(), "typedef") == 0
+         || strcmp(pc->Text(), "volatile") == 0
+         || strcmp(pc->Text(), "_Atomic") == 0
+         || strcmp(pc->Text(), "_Thread_local") == 0);
+}
+
+
+static bool is_non_integer(const Chunk *pc)
+{
+   return(  strcmp(pc->Text(), "char") == 0
+         || strcmp(pc->Text(), "double") == 0);
+}
+
+
+static bool find_non_storage_siblings(const Chunk *pc, Chunk * &prev, Chunk * &next)
+{
+   prev = pc->GetPrevNcNnl();
+   next = pc->GetNextNcNnl();
+
+   // Find the last token that was not a storage keyword
+   while (is_storage_keyword(prev))
+   {
+      prev = prev->GetPrevNcNnl();
+   }
+
+   // Return false if the last token indicates that this is not an integer type
+   if (is_non_integer(prev))
+   {
+      return(false);
+   }
+
+   // Find the next token that is not a storage keyword
+   while (is_storage_keyword(next))
+   {
+      next = next->GetNextNcNnl();
+   }
+
+   // Return false if the next token indicates that this is not an integer type
+   if (is_non_integer(next))
+   {
+      return(false);
+   }
+   // Return true if this is indeed an integer type
+   return(true);
+}
+
+
+static void add_or_remove_int_keyword(Chunk *pc, Chunk *sibling, iarf_e action, E_Direction dir, Chunk * &int_keyword)
+{
+   if (strcmp(sibling->Text(), "int") == 0)
+   {
+      if (action == IARF_REMOVE)
+      {
+         if (sibling == int_keyword)
+         {
+            int_keyword = nullptr;
+         }
+         Chunk::Delete(sibling);
+      }
+      else if (  int_keyword != nullptr
+              && int_keyword != sibling)
+      {
+         // We added an int keyword, but now we see that there already was one.
+         // Keep one or the other but not both.
+         if (options::mod_int_prefer_int_on_left())
+         {
+            Chunk::Delete(sibling);
+         }
+         else
+         {
+            Chunk::Delete(int_keyword);
+            int_keyword = sibling;
+         }
+      }
+      else
+      {
+         int_keyword = sibling;
+      }
+   }
+   else
+   {
+      if (  action == IARF_ADD
+         || action == IARF_FORCE)
+      {
+         if (int_keyword)
+         {
+            // 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.
+            if (options::mod_int_prefer_int_on_left())
+            {
+               return;
+            }
+            else
+            {
+               Chunk::Delete(int_keyword);
+            }
+         }
+
+         if (dir == E_Direction::BACKWARD)
+         {
+            int_keyword = pc->CopyAndAddBefore(pc);
+         }
+         else
+         {
+            int_keyword = pc->CopyAndAddAfter(pc);
+         }
+         int_keyword->Str() = "int";
+      }
+   }
+} // add_or_remove_int_keyword
+
+
+void change_int_types()
+{
+   LOG_FUNC_ENTRY();
+
+   Chunk *prev;
+   Chunk *next;
+   Chunk *int_keyword = nullptr;
+
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
+   {
+      if (strcmp(pc->Text(), "short") == 0)
+      {
+         if (find_non_storage_siblings(pc, prev, next))
+         {
+            add_or_remove_int_keyword(pc, prev, options::mod_int_short(), E_Direction::BACKWARD, int_keyword);
+            add_or_remove_int_keyword(pc, next, options::mod_short_int(), E_Direction::FORWARD, int_keyword);
+         }
+      }
+      else if (strcmp(pc->Text(), "long") == 0)
+      {
+         if (find_non_storage_siblings(pc, prev, next))
+         {
+            add_or_remove_int_keyword(pc, prev, options::mod_int_long(), E_Direction::BACKWARD, int_keyword);
+            add_or_remove_int_keyword(pc, next, options::mod_long_int(), E_Direction::FORWARD, int_keyword);
+         }
+      }
+      else if (strcmp(pc->Text(), "signed") == 0)
+      {
+         if (find_non_storage_siblings(pc, prev, next))
+         {
+            add_or_remove_int_keyword(pc, prev, options::mod_int_signed(), E_Direction::BACKWARD, int_keyword);
+            add_or_remove_int_keyword(pc, next, options::mod_signed_int(), E_Direction::FORWARD, int_keyword);
+         }
+      }
+      else if (strcmp(pc->Text(), "unsigned") == 0)
+      {
+         if (find_non_storage_siblings(pc, prev, next))
+         {
+            add_or_remove_int_keyword(pc, prev, options::mod_int_unsigned(), E_Direction::BACKWARD, int_keyword);
+            add_or_remove_int_keyword(pc, next, options::mod_unsigned_int(), E_Direction::FORWARD, int_keyword);
+         }
+      }
+      else if (  strcmp(pc->Text(), "int") != 0
+              && !is_storage_keyword(pc))
+      {
+         int_keyword = nullptr; // 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.76.0/src/change_int_types.h
new file mode 100644
index 00000000..b392a5d7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/change_int_types.h
@@ -0,0 +1,19 @@
+/**
+ * @file change_int_types.h
+ * prototypes for change_int_types.cpp
+ *
+ * @author  Alex Henrie
+ * @license GPL v2+
+ */
+
+#ifndef CHANGE_INT_TYPES_H_INCLUDED
+#define CHANGE_INT_TYPES_H_INCLUDED
+
+
+/**
+ * @brief Add or remove redundant 'int' keyword of integer types
+ */
+void change_int_types();
+
+
+#endif /* CHANGE_INT_TYPES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/char_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/char_table.h
index 3fa23a54..bcc30404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/char_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/char_table.h
@@ -10,6 +10,9 @@
 #ifndef CHAR_TABLE_H_INCLUDED
 #define CHAR_TABLE_H_INCLUDED
 
+#include "base_types.h"
+#include <cstddef>
+
 /**
  * bit0-7 = paired char
  * bit8 = OK for keyword 1st char
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.cpp
new file mode 100644
index 00000000..125879b6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.cpp
@@ -0,0 +1,896 @@
+/**
+ * @file chunk.cpp
+ * Manages and navigates the list of chunks.
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#include "chunk.h"
+
+#include "ListManager.h"
+#include "prototypes.h"
+#include "space.h"
+
+static ChunkListManager gChunkList;  // global chunk list
+
+
+/*
+ * Chunk class methods
+ */
+
+// Null Chunk
+Chunk        Chunk::NullChunk(true);
+Chunk *const Chunk::NullChunkPtr(&Chunk::NullChunk);
+
+
+void Chunk::CopyFrom(const Chunk &o)
+{
+   m_type         = o.m_type;
+   m_parentType   = o.m_parentType;
+   m_origLine     = o.m_origLine;
+   m_origCol      = o.m_origCol;
+   m_origColEnd   = o.m_origColEnd;
+   m_origPrevSp   = o.m_origPrevSp;
+   m_column       = o.m_column;
+   m_columnIndent = o.m_columnIndent;
+   m_nlCount      = o.m_nlCount;
+   m_nlColumn     = o.m_nlColumn;
+   m_level        = o.m_level;
+   m_braceLevel   = o.m_braceLevel;
+   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_next   = Chunk::NullChunkPtr;
+   m_prev   = Chunk::NullChunkPtr;
+   m_parent = Chunk::NullChunkPtr;
+
+   m_str          = o.m_str;
+   m_trackingData = o.m_trackingData;
+}
+
+
+void Chunk::Reset()
+{
+   m_type         = CT_NONE;
+   m_parentType   = CT_NONE;
+   m_origLine     = 0;
+   m_origCol      = 0;
+   m_origColEnd   = 0;
+   m_origPrevSp   = 0;
+   m_column       = 0;
+   m_columnIndent = 0;
+   m_nlCount      = 0;
+   m_nlColumn     = 0;
+   m_level        = 0;
+   m_braceLevel   = 0;
+   m_ppLevel      = 999;            // use a big value to find some errors
+   m_afterTab     = false;
+
+   m_flags = PCF_NONE;
+   memset(&m_alignmentData, 0, sizeof(m_alignmentData));
+   memset(&m_indentData, 0, sizeof(m_indentData));
+
+   m_next   = Chunk::NullChunkPtr;
+   m_prev   = Chunk::NullChunkPtr;
+   m_parent = Chunk::NullChunkPtr;
+
+   // for debugging purpose only
+   m_str.clear();
+   m_trackingData = nullptr;
+}
+
+
+const char *Chunk::ElidedText(char *for_the_copy) const
+{
+   const char *test_it       = Text();
+   size_t     test_it_length = strlen(test_it);
+
+   size_t     truncate_value = uncrustify::options::debug_truncate();
+
+   if (truncate_value != 0)
+   {
+      if (test_it_length > truncate_value)
+      {
+         memset(for_the_copy, 0, 1000);
+
+         if (test_it_length < truncate_value + 30)
+         {
+            strncpy(for_the_copy, test_it, truncate_value - 30);
+            for_the_copy[truncate_value - 30] = 0;
+         }
+         else
+         {
+            strncpy(for_the_copy, test_it, truncate_value);
+            for_the_copy[truncate_value] = 0;
+         }
+         char *message = strcat(for_the_copy, " ... <The string is truncated>");
+
+         return(message);
+      }
+      else
+      {
+         return(test_it);
+      }
+   }
+   return(test_it);
+}
+
+
+Chunk *Chunk::GetNext(const E_Scope scope) const
+{
+   if (scope == E_Scope::ALL)
+   {
+      return(m_next);
+   }
+   Chunk *pc = m_next;
+
+   if (TestFlags(PCF_IN_PREPROC))
+   {
+      // If in a preproc, return a null chunk if trying to leave
+      if (!pc->TestFlags(PCF_IN_PREPROC))
+      {
+         return(NullChunkPtr);
+      }
+      return(pc);
+   }
+
+   // Not in a preproc, skip any preproc
+   while (  pc->IsNotNullChunk()
+         && pc->TestFlags(PCF_IN_PREPROC))
+   {
+      pc = pc->m_next;
+   }
+   return(pc);
+} // Chunk::GetNext
+
+
+Chunk *Chunk::GetPrev(const E_Scope scope) const
+{
+   if (scope == E_Scope::ALL)
+   {
+      return(m_prev);
+   }
+   Chunk *pc = m_prev;
+
+   if (TestFlags(PCF_IN_PREPROC))
+   {
+      // If in a preproc, return a null chunk if trying to leave
+      if (!pc->TestFlags(PCF_IN_PREPROC))
+      {
+         return(NullChunkPtr);
+      }
+      return(pc);
+   }
+
+   // Not in a preproc, skip any preproc
+   while (  pc->IsNotNullChunk()
+         && pc->TestFlags(PCF_IN_PREPROC))
+   {
+      pc = pc->m_prev;
+   }
+   return(pc);
+} // Chunk::GetPrev
+
+
+static void chunk_log(Chunk *pc, const char *text);
+
+
+Chunk *Chunk::GetHead()
+{
+   return(gChunkList.GetHead());
+}
+
+
+Chunk *Chunk::GetTail()
+{
+   return(gChunkList.GetTail());
+}
+
+
+Chunk::T_SearchFnPtr Chunk::GetSearchFn(const E_Direction dir)
+{
+   return((dir == E_Direction::FORWARD) ? &Chunk::GetNext : &Chunk::GetPrev);
+}
+
+
+Chunk *Chunk::Search(const T_CheckFnPtr checkFn, const E_Scope scope,
+                     const E_Direction dir, const bool cond) const
+{
+   T_SearchFnPtr searchFnPtr = GetSearchFn(dir);
+   Chunk         *pc         = const_cast<Chunk *>(this);
+
+   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->*checkFn)() != cond)); // and the demanded chunk was not found either
+
+   return(pc);                             // the latest chunk is the searched one
+}
+
+
+bool Chunk::IsOnSameLine(const Chunk *end) const
+{
+   if (IsNullChunk())
+   {
+      return(false);
+   }
+   Chunk *tmp = GetNext();
+
+   while (  tmp->IsNotNullChunk()
+         && tmp != end)
+   {
+      if (tmp->Is(CT_NEWLINE))
+      {
+         return(false);
+      }
+      tmp = tmp->GetNext();
+   }
+   return(true);
+}
+
+
+Chunk *Chunk::SearchTypeLevel(const E_Token type, const E_Scope scope,
+                              const E_Direction dir, const int level) const
+{
+   T_SearchFnPtr searchFnPtr = GetSearchFn(dir);
+   Chunk         *pc         = const_cast<Chunk *>(this);
+
+   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->IsTypeAndLevel(type, level))); // and the chunk was not found either
+
+   return(pc);                                     // the latest chunk is the searched one
+}
+
+
+Chunk *Chunk::SearchStringLevel(const char *cStr, 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
+   {
+      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
+
+   return(pc);                                                // the latest chunk is the searched one
+}
+
+
+Chunk *Chunk::SearchPpa(const T_CheckFnPtr checkFn, const bool cond) const
+{
+   if (!TestFlags(PCF_IN_PREPROC))
+   {
+      // if not in preprocessor, do a regular search
+      return(Search(checkFn, E_Scope::ALL, E_Direction::FORWARD, cond));
+   }
+   Chunk *pc = GetNext();
+
+   while (pc->IsNotNullChunk())
+   {
+      if (!pc->TestFlags(PCF_IN_PREPROC))
+      {
+         // Bail if we run off the end of the preprocessor directive, but return
+         // the token because the caller may need to know where the search ended
+         assert(pc->Is(CT_NEWLINE));
+         return(pc);
+      }
+
+      if (pc->Is(CT_NL_CONT))
+      {
+         // Skip line continuation
+         pc = pc->GetNext();
+         continue;
+      }
+
+      if ((pc->*checkFn)() == cond)
+      {
+         // Requested token was found
+         return(pc);
+      }
+      pc = pc->GetNext();
+   }
+   // Ran out of tokens
+   return(Chunk::NullChunkPtr);
+}
+
+
+static void chunk_log_msg(Chunk *chunk, const log_sev_t log, const char *str)
+{
+   LOG_FMT(log, "%s orig line is %zu, orig col is %zu, ",
+           str, chunk->GetOrigLine(), chunk->GetOrigCol());
+
+   if (chunk->Is(CT_NEWLINE))
+   {
+      LOG_FMT(log, "<Newline>,\n");
+   }
+   else if (chunk->Is(CT_VBRACE_OPEN))
+   {
+      LOG_FMT(log, "<VBRACE_OPEN>,\n");
+   }
+   else if (chunk->Is(CT_VBRACE_CLOSE))
+   {
+      LOG_FMT(log, "<VBRACE_CLOSE>,\n");
+   }
+   else
+   {
+      LOG_FMT(log, "Text() is '%s', type is %s,\n", chunk->Text(), get_token_name(chunk->GetType()));
+   }
+}
+
+
+static void chunk_log(Chunk *pc, const char *text)
+{
+   if (  pc != nullptr
+      && pc->IsNotNullChunk()
+      && (cpd.unc_stage != unc_stage_e::TOKENIZE)
+      && (cpd.unc_stage != unc_stage_e::CLEANUP))
+   {
+      const log_sev_t log   = LCHUNK;
+      Chunk           *prev = pc->GetPrev();
+      Chunk           *next = pc->GetNext();
+
+      chunk_log_msg(pc, log, text);
+
+      if (  prev->IsNotNullChunk()
+         && next->IsNotNullChunk())
+      {
+         chunk_log_msg(prev, log, "   @ between");
+         chunk_log_msg(next, log, "   and");
+      }
+      else if (next->IsNotNullChunk())
+      {
+         chunk_log_msg(next, log, "   @ before");
+      }
+      else if (prev->IsNotNullChunk())
+      {
+         chunk_log_msg(prev, log, "   @ after");
+      }
+      LOG_FMT(log, "   stage is %s",                             // Issue #3034
+              get_unc_stage_name(cpd.unc_stage));
+      log_func_stack_inline(log);
+   }
+}
+
+
+void Chunk::Delete(Chunk * &pc)
+{
+   gChunkList.Remove(pc);
+   delete pc;
+   pc = Chunk::NullChunkPtr;
+}
+
+
+void Chunk::MoveAfter(Chunk *ref)
+{
+   LOG_FUNC_ENTRY();
+
+   if (ref == this)
+   {
+      return;
+   }
+   gChunkList.Remove(this);
+   gChunkList.AddAfter(this, ref);
+
+   // Adjust the original column
+   m_column     = ref->m_column + space_col_align(ref, this);
+   m_origCol    = m_column;
+   m_origColEnd = m_origCol + Len();
+}
+
+
+void Chunk::Swap(Chunk *other)
+{
+   gChunkList.Swap(this, other);
+}
+
+
+bool Chunk::IsAddress() const
+{
+   if (  IsNotNullChunk()
+      && (  Is(CT_BYREF)
+         || (  Len() == 1
+            && m_str[0] == '&'
+            && IsNot(CT_OPERATOR_VAL))))
+   {
+      Chunk *prevc = GetPrev();
+
+      if (  TestFlags(PCF_IN_TEMPLATE)
+         && (  prevc->Is(CT_COMMA)
+            || prevc->Is(CT_ANGLE_OPEN)))
+      {
+         return(false);
+      }
+      return(true);
+   }
+   return(false);
+}
+
+
+Chunk *Chunk::GetFirstChunkOnLine() const
+{
+   Chunk *pc    = const_cast<Chunk *>(this);
+   Chunk *first = pc;
+
+   pc = pc->GetPrev();
+
+   while (  pc->IsNotNullChunk()
+         && !pc->IsNewline())
+   {
+      first = pc;
+      pc    = pc->GetPrev();
+   }
+   return(first);
+}
+
+
+bool Chunk::IsLastChunkOnLine() const
+{
+   if (this == Chunk::GetTail())
+   {
+      return(true);
+   }
+
+   // if the next chunk is a newline then pc is the last chunk on its line
+   if (GetNext()->Is(CT_NEWLINE))
+   {
+      return(true);
+   }
+   return(false);
+}
+
+
+void Chunk::SwapLines(Chunk *other)
+{
+   // to swap lines we need to find the first chunk of the lines
+   Chunk *pc1 = GetFirstChunkOnLine();
+   Chunk *pc2 = other->GetFirstChunkOnLine();
+
+   if (  pc1->IsNullChunk()
+      || pc2->IsNullChunk()
+      || pc1 == pc2)
+   {
+      return;
+   }
+   /*
+    * Example start:
+    * ? - start1 - a1 - b1 - nl1 - ? - ref2 - start2 - a2 - b2 - nl2 - ?
+    *      ^- pc1                              ^- pc2
+    */
+   Chunk *ref2 = pc2->GetPrev();
+
+   // Move the line started at pc2 before pc1
+   while (  pc2->IsNotNullChunk()
+         && !pc2->IsNewline())
+   {
+      Chunk *tmp = pc2->GetNext();
+      gChunkList.Remove(pc2);
+      gChunkList.AddBefore(pc2, pc1);
+      pc2 = tmp;
+   }
+   /*
+    * Should now be:
+    * ? - start2 - a2 - b2 - start1 - a1 - b1 - nl1 - ? - ref2 - nl2 - ?
+    *                         ^- pc1                              ^- pc2
+    */
+
+   // Now move the line started at pc1 after ref2
+   while (  pc1->IsNotNullChunk()
+         && !pc1->IsNewline())
+   {
+      Chunk *tmp = pc1->GetNext();
+      gChunkList.Remove(pc1);
+
+      if (ref2->IsNotNullChunk())
+      {
+         gChunkList.AddAfter(pc1, ref2);
+      }
+      else
+      {
+         gChunkList.AddHead(pc1);
+      }
+      ref2 = pc1;
+      pc1  = tmp;
+   }
+   /*
+    * Should now be:
+    * ? - start2 - a2 - b2 - nl1 - ? - ref2 - start1 - a1 - b1 - nl2 - ?
+    *                         ^- pc1                              ^- pc2
+    */
+
+   /*
+    * pc1 and pc2 should be the newlines for their lines.
+    * swap the chunks and the new line count so that the spacing remains the same.
+    */
+   if (  pc1->IsNotNullChunk()
+      && pc2->IsNotNullChunk())
+   {
+      size_t nlCount = pc1->GetNlCount();
+
+      pc1->SetNlCount(pc2->GetNlCount());
+      pc2->SetNlCount(nlCount);
+
+      pc1->Swap(pc2);
+   }
+} // Chunk::SwapLines
+
+
+void Chunk::SetResetFlags(T_PcfFlags resetBits, T_PcfFlags setBits)
+{
+   if (IsNotNullChunk())
+   {
+      LOG_FUNC_ENTRY();
+      const T_PcfFlags newFlags = (m_flags & ~resetBits) | setBits;
+
+      if (m_flags != newFlags)
+      {
+         LOG_FMT(LSETFLG,
+                 "%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),
+                 __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));
+         log_func_stack_inline(LSETFLG);
+
+         LOG_FMT(LSETFLG, "  before: ");
+         log_pcf_flags(LSETFLG, m_flags);
+         LOG_FMT(LSETFLG, "  after:  ");
+         log_pcf_flags(LSETFLG, newFlags);
+         m_flags = newFlags;
+      }
+   }
+}
+
+
+void Chunk::SetTypeReal(const E_Token token, const char *func, const int line)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  IsNullChunk()
+      || m_type == token)
+   {
+      return;
+   }
+   LOG_FMT(LSETTYP, "%s(%d): orig line is %zu, orig col is %zu, Text() is ",
+           func, line, m_origLine, m_origCol);
+
+   if (token == CT_NEWLINE)
+   {
+      LOG_FMT(LSETTYP, "<Newline>\n");
+   }
+   else
+   {
+      LOG_FMT(LSETTYP, "'%s'\n", Text());
+   }
+   LOG_FMT(LSETTYP, "   type is %s, parent type is %s => new type is %s\n",
+           get_token_name(m_type), get_token_name(m_parentType), get_token_name(token));
+   m_type = token;
+}
+
+
+void Chunk::SetParentTypeReal(const E_Token token, const char *func, const int line)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  IsNullChunk()
+      || m_parentType == token)
+   {
+      return;
+   }
+   LOG_FMT(LSETPAR, "%s(%d): orig line is %zu, orig col is %zu, Text() is ",
+           func, line, m_origLine, m_origCol);
+
+   if (token == CT_NEWLINE)
+   {
+      LOG_FMT(LSETPAR, "<Newline>\n");
+   }
+   else
+   {
+      LOG_FMT(LSETPAR, "'%s'\n", Text());
+   }
+   LOG_FMT(LSETPAR, "   type is %s, parent type is %s => new parent type is %s\n",
+           get_token_name(m_type), get_token_name(m_parentType), get_token_name(token));
+   m_parentType = token;
+}
+
+
+Chunk *Chunk::CopyAndAdd(Chunk *pos, const E_Direction dir) const
+{
+#ifdef DEBUG
+   // test if this chunk is properly set
+   if (m_ppLevel == 999)
+   {
+      fprintf(stderr, "%s(%d): pp level is not set\n", __func__, __LINE__);
+      log_func_stack_inline(LSETFLG);
+      log_flush(true);
+      exit(EX_SOFTWARE);
+   }
+
+   if (m_origLine == 0)
+   {
+      fprintf(stderr, "%s(%d): no line number\n", __func__, __LINE__);
+      log_func_stack_inline(LSETFLG);
+      log_flush(true);
+      exit(EX_SOFTWARE);
+   }
+
+   if (m_origCol == 0)
+   {
+      fprintf(stderr, "%s(%d): no column number\n", __func__, __LINE__);
+      log_func_stack_inline(LSETFLG);
+      log_flush(true);
+      exit(EX_SOFTWARE);
+   }
+#endif /* DEBUG */
+
+   Chunk *pc = new Chunk(*this);
+
+   if (  pos != nullptr
+      && pos->IsNotNullChunk())
+   {
+      (dir == E_Direction::FORWARD) ? gChunkList.AddAfter(pc, pos) : gChunkList.AddBefore(pc, pos);
+   }
+   else
+   {
+      (dir == E_Direction::FORWARD) ? gChunkList.AddHead(pc) : gChunkList.AddTail(pc);
+   }
+   chunk_log(pc, "CopyAndAdd(A):");
+   return(pc);
+} // Chunk::CopyAndAdd
+
+
+Chunk *Chunk::GetNextNbsb() const
+{
+   Chunk *pc = const_cast<Chunk *>(this);
+
+   while (  pc->Is(CT_TSQUARE)
+         || pc->Is(CT_SQUARE_OPEN))
+   {
+      if (pc->Is(CT_SQUARE_OPEN))
+      {
+         pc = pc->GetClosingParen();
+      }
+      pc = pc->GetNextNcNnl();
+   }
+   return(pc);
+}
+
+
+Chunk *Chunk::GetPrevNbsb() const
+{
+   Chunk *pc = const_cast<Chunk *>(this);
+
+   while (  pc->Is(CT_TSQUARE)
+         || pc->Is(CT_SQUARE_CLOSE))
+   {
+      if (pc->Is(CT_SQUARE_CLOSE))
+      {
+         pc = pc->GetOpeningParen();
+      }
+      pc = pc->GetPrevNcNnl();
+   }
+   return(pc);
+}
+
+
+Chunk *Chunk::GetPpStart() const
+{
+   if (!IsPreproc())
+   {
+      return(Chunk::NullChunkPtr);
+   }
+   Chunk *pc = const_cast<Chunk *>(this);
+
+   while (pc->IsNot(CT_PREPROC))
+   {
+      pc = pc->GetPrev(E_Scope::PREPROC);
+   }
+   return(pc);
+}
+
+
+Chunk *Chunk::SkipDcMember() const
+{
+   LOG_FUNC_ENTRY();
+
+   Chunk *pc  = const_cast<Chunk *>(this);
+   Chunk *nxt = pc->Is(CT_DC_MEMBER) ? pc : pc->GetNextNcNnl(E_Scope::ALL);
+
+   while (nxt->Is(CT_DC_MEMBER))
+   {
+      pc = nxt->GetNextNcNnl(E_Scope::ALL);
+
+      if (pc->IsNullChunk())
+      {
+         return(Chunk::NullChunkPtr);
+      }
+      nxt = pc->GetNextNcNnl(E_Scope::ALL);
+   }
+   return(pc);
+}
+
+
+int Chunk::ComparePosition(const Chunk *other) const
+{
+   if (m_origLine < other->m_origLine)
+   {
+      return(-1);
+   }
+   else if (m_origLine == other->m_origLine)
+   {
+      if (m_origCol < other->m_origCol)
+      {
+         return(-1);
+      }
+      else if (m_origCol == other->m_origCol)
+      {
+         return(0);
+      }
+   }
+   return(1);
+}
+
+
+bool Chunk::IsOCForinOpenParen() const
+{
+   if (  language_is_set(LANG_OC)
+      && Is(CT_SPAREN_OPEN)
+      && GetPrevNcNnl()->Is(CT_FOR))
+   {
+      Chunk *nxt = const_cast<Chunk *>(this);
+
+      while (  nxt->IsNotNullChunk()
+            && nxt->IsNot(CT_SPAREN_CLOSE)
+            && nxt->IsNot(CT_IN))
+      {
+         nxt = nxt->GetNextNcNnl();
+      }
+
+      if (nxt->Is(CT_IN))
+      {
+         return(true);
+      }
+   }
+   return(false);
+}
+
+
+bool Chunk::IsStringAndLevel(const char *cStr, 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)
+            || (  !caseSensitive
+               && strncasecmp(Text(), cStr, len) == 0)));   // the strings are equal
+}
+
+
+Chunk *Chunk::GetClosingParen(E_Scope scope) const
+{
+   if (  Is(CT_PAREN_OPEN)
+      || Is(CT_SPAREN_OPEN)
+      || Is(CT_FPAREN_OPEN)
+      || Is(CT_TPAREN_OPEN)
+      || Is(CT_BRACE_OPEN)
+      || Is(CT_VBRACE_OPEN)
+      || Is(CT_ANGLE_OPEN)
+      || Is(CT_SQUARE_OPEN))
+   {
+      return(GetNextType((E_Token)(m_type + 1), m_level, scope));
+   }
+   return(const_cast<Chunk *>(this));
+}
+
+
+Chunk *Chunk::GetOpeningParen(E_Scope scope) const
+{
+   if (  Is(CT_PAREN_CLOSE)
+      || Is(CT_SPAREN_CLOSE)
+      || Is(CT_FPAREN_CLOSE)
+      || Is(CT_TPAREN_CLOSE)
+      || Is(CT_BRACE_CLOSE)
+      || Is(CT_VBRACE_CLOSE)
+      || Is(CT_ANGLE_CLOSE)
+      || Is(CT_SQUARE_CLOSE))
+   {
+      return(GetPrevType((E_Token)(m_type - 1), m_level, scope));
+   }
+   return(const_cast<Chunk *>(this));
+}
+
+
+bool Chunk::IsCppInheritanceAccessSpecifier() const
+{
+   return(  language_is_set(LANG_CPP)
+         && (  Is(CT_ACCESS)
+            || Is(CT_QUALIFIER))
+         && (  IsString("private")
+            || IsString("protected")
+            || IsString("public")));
+}
+
+
+bool Chunk::IsColon() const
+{
+   return(  Is(CT_ACCESS_COLON)
+         || Is(CT_ASM_COLON)
+         || Is(CT_BIT_COLON)
+         || Is(CT_CASE_COLON)
+         || Is(CT_CLASS_COLON)
+         || Is(CT_COLON)
+         || Is(CT_COND_COLON)
+         || Is(CT_CONSTR_COLON)
+         || Is(CT_CS_SQ_COLON)
+         || Is(CT_D_ARRAY_COLON)
+         || Is(CT_FOR_COLON)
+         || Is(CT_LABEL_COLON)
+         || Is(CT_OC_COLON)
+         || Is(CT_OC_DICT_COLON)
+         || Is(CT_TAG_COLON)
+         || Is(CT_WHERE_COLON));
+}
+
+
+bool Chunk::IsDoxygenComment() const
+{
+   if (!IsComment())
+   {
+      return(false);
+   }
+
+   if (Len() < 3)
+   {
+      return(false);
+   }
+   // check the third character
+   const char *sComment = Text();
+   return(  (sComment[2] == '/')
+         || (sComment[2] == '!')
+         || (sComment[2] == '@'));
+}
+
+
+bool Chunk::IsTypeDefinition() const
+{
+   return(  Is(CT_TYPE)
+         || Is(CT_PTR_TYPE)
+         || Is(CT_BYREF)
+         || Is(CT_DC_MEMBER)
+         || Is(CT_QUALIFIER)
+         || Is(CT_STRUCT)
+         || Is(CT_ENUM)
+         || Is(CT_UNION));
+}
+
+
+bool Chunk::IsNewlineBetween(const Chunk *other) const
+{
+   Chunk *pc = const_cast<Chunk *>(this);
+
+   while (pc != other)
+   {
+      if (pc->IsNewline())
+      {
+         return(true);
+      }
+      pc = pc->GetNext();
+   }
+   return(false);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.h
new file mode 100644
index 00000000..fe705fe1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.h
@@ -0,0 +1,1801 @@
+/**
+ * @file chunk.h
+ * Manages and navigates the list of chunks.
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#ifndef CHUNK_LIST_H_INCLUDED
+#define CHUNK_LIST_H_INCLUDED
+
+#include "uncrustify_types.h"
+// necessary to not sort it
+#include "char_table.h"
+#include "language_tools.h"
+
+
+static constexpr int ANY_LEVEL = -1;
+
+
+/**
+ * Specifies which chunks should/should not be found.
+ * ALL (default)
+ *  - return the true next/prev
+ *
+ * PREPROC
+ *  - If not in a preprocessor, skip over any encountered preprocessor stuff
+ *  - If in a preprocessor, fail to leave (return Chunk::NullChunkPtr)
+ */
+enum class E_Scope : unsigned int
+{
+   ALL,      //! search in all kind of chunks
+   PREPROC,  //! search only in preprocessor chunks
+};
+
+
+/**
+ * Specifies which direction or location an operation shall be performed.
+ */
+enum class E_Direction : unsigned int
+{
+   FORWARD,
+   BACKWARD
+};
+
+
+class ChunkListManager;
+
+// This is the main type of this program
+class Chunk
+{
+   friend ChunkListManager;
+
+public:
+   //! constructors
+   Chunk(bool null_c = false);                    // default
+   Chunk(const Chunk &o);                         // !!! partial copy: chunk is not linked to others
+
+   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); }
+
+   //! sets all elements of the struct to their default value
+   void Reset();
+
+
+   // --------- Access methods
+
+   /**
+    * @brief returns the type of the chunk
+    */
+   E_Token GetType() const;
+
+   /**
+    * @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);
+
+   /**
+    * @brief Returns the parent type of the chunk
+    */
+   E_Token GetParentType() const;
+
+   /**
+    * @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);
+
+   /**
+    * @brief Returns the parent of the chunk
+    */
+   Chunk *GetParent() const;
+
+   /**
+    * @brief Sets the parent of the chunk
+    * @param parent the parent chunk to set
+    */
+   void SetParent(Chunk *parent);
+
+   /**
+    * @brief Returns the alignment data of the chunk as a const reference
+    */
+   const T_AlignData &GetAlignmentData() const;
+
+   /**
+    * @brief Returns the alignment data of the chunk as a modifiable reference
+    */
+   T_AlignData &AlignmentData();
+
+   /**
+    * @brief Returns the indentation data of the chunk as a const reference
+    */
+   const T_IndentData &GetIndentData() const;
+
+   /**
+    * @brief Returns the indentation data of the chunk as a modifiable reference
+    */
+   T_IndentData &IndentData();
+
+   /**
+    * @brief Returns the text data of the chunk as a const reference
+    */
+   const unc_text &GetStr() const;
+
+   /**
+    * @brief Returns the text data of the chunk as a modifiable reference
+    */
+   unc_text &Str();
+
+   /**
+    * @brief returns the number of characters in the chunk text	string
+    */
+   size_t Len() const;
+
+   /**
+    * @brief returns the content of the chunk text as C string
+    */
+   const char *Text() const;
+
+   /**
+    * Returns a filled up (if necessary) copy of the first chars of the Text() string
+    */
+   const char *ElidedText(char *for_the_copy) const;
+
+   /**
+    * @brief Returns the tracking data of the chunk as a const reference
+    */
+   const track_list *GetTrackingData() const;
+
+   /**
+    * @brief Returns the tracking data of the chunk as a modifiable reference
+    */
+   track_list * &TrackingData();
+
+   /**
+    * @brief Returns the type of the parent chunk
+    */
+   E_Token GetTypeOfParent() const;
+
+   /**
+    * @brief Returns the chunk flags
+    */
+   T_PcfFlags GetFlags() const;
+
+   /**
+    * @brief Sets the chunk flags
+    * @param flags the new chunk flags
+    */
+   void SetFlags(T_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;
+
+   /**
+    * @brief Resets some of the chunk flag bits
+    * @param resetBits the flag bits to reset
+    */
+   void ResetFlagBits(T_PcfFlags resetBits);
+
+   /**
+    * @brief Sets some of the chunk flag bits
+    * @param setBits the flag bits to set
+    */
+   void SetFlagBits(T_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);
+
+   /**
+    * @brief Returns the line number of the chunk in the input file
+    */
+   size_t GetOrigLine() const;
+
+   /**
+    * @brief Sets the line number of the chunk in the input file
+    * @param line the line number of the chunk
+    */
+   void SetOrigLine(size_t line);
+
+   /**
+    * @brief Returns the column number of the chunk in the input file
+    */
+   size_t GetOrigCol() const;
+
+   /**
+    * @brief Sets the column number of the chunk in the input file
+    * @param col the column number of the chunk
+    */
+   void SetOrigCol(size_t col);
+
+   /**
+    * @brief Returns the end column number of the chunk in the input file
+    */
+   size_t GetOrigColEnd() const;
+
+   /**
+    * @brief Sets the end column number of the chunk in the input file
+    * @param col the end column number of the chunk
+    */
+   void SetOrigColEnd(size_t col);
+
+   /**
+    * @brief Returns the position of the whitespace before this chunk
+    */
+   size_t GetOrigPrevSp() const;
+
+   /**
+    * @brief Sets the position of the whitespace before this chunk
+    * @param col the end column number of the chunk in the input file
+    */
+   void SetOrigPrevSp(size_t col);
+
+   /**
+    * @brief Returns the column of the chunk
+    */
+   size_t GetColumn() const;
+
+   /**
+    * @brief Sets the column of the chunk
+    * @param col the column of the chunk
+    */
+   void SetColumn(size_t col);
+
+   /**
+    * @brief Returns the column indentation of the chunk
+    */
+   size_t GetColumnIndent() const;
+
+   /**
+    * @brief Sets the column indentation of the chunk
+    * @param col the column indentation of the chunk
+    */
+   void SetColumnIndent(size_t col);
+
+   /**
+    * @brief Returns the number of newlines in a CT_NEWLINE chunk
+    */
+   size_t GetNlCount() const;
+
+   /**
+    * @brief Sets the number of newlines in a CT_NEWLINE chunk
+    * @param cnt the number of newlines
+    */
+   void SetNlCount(size_t cnt);
+
+   /**
+    * @brief Returns the column of the newline entries
+    */
+   size_t GetNlColumn() const;
+
+   /**
+    * @brief Sets the column of the newline entries
+    * @param col the number of the column
+    */
+   void SetNlColumn(size_t col);
+
+   /**
+    * @brief Returns the level of the chunk
+    */
+   size_t GetLevel() const;
+
+   /**
+    * @brief Sets the level of the chunk
+    * @param col the level of the chunk
+    */
+   void SetLevel(size_t level);
+
+   /**
+    * @brief Returns the brace level of the chunk
+    */
+   size_t GetBraceLevel() const;
+
+   /**
+    * @brief Sets the brace level of the chunk
+    * @param level the brace level of the chunk
+    */
+   void SetBraceLevel(size_t lvl);
+
+   /**
+    * @brief Returns the preprocessor level of the chunk
+    */
+   size_t GetPpLevel() const;
+
+   /**
+    * @brief Sets the preprocessor level of the chunk
+    * @param level the preprocessor level of the chunk
+    */
+   void SetPpLevel(size_t lvl);
+
+   /**
+    * @brief Returns the after tab property of the chunk
+    */
+   bool GetAfterTab() const;
+
+   /**
+    * @brief Sets the after tab property of the chunk
+    * @param afterTab the after tab property of the chunk
+    */
+   void SetAfterTab(bool afterTab);
+
+
+   // --------- Get* chunk functions
+
+   /**
+    * @brief returns the head of the chunk list
+    * @return pointer to the first chunk
+    */
+   static Chunk *GetHead();
+
+   /**
+    * @brief returns the tail of the chunk list
+    * @return pointer to the last chunk
+    */
+   static Chunk *GetTail();
+
+   /**
+    * @brief returns the next chunk in a list of chunks
+    * @param scope code region to search in
+    * @return pointer to next chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNext(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the previous chunk in a list of chunks
+    * @param scope code region to search in
+    * @return pointer to previous chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrev(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next newline chunk
+    * @param scope code region to search in
+    * @return pointer to next newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev newline chunk
+    * @param scope code region to search in
+    * @return pointer to prev newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next non-newline chunk
+    * @param scope code region to search in
+    * @return pointer to next non-newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNnl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-newline chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNnl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next non-comment chunk
+    * @param scope code region to search in
+    * @return pointer to next non-comment chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNc(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-comment chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-comment chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNc(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next non-comment and non-newline chunk
+    * @param scope code region to search in
+    * @return pointer to next non-comment and non-newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNcNnl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-comment and non-newline chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-comment and non-newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNcNnl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next non-comment, non-newline, non-preprocessor chunk
+    * @param scope code region to search in
+    * @return pointer to next non-comment, non-newline, non-preprocessor chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNcNnlNpp(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-comment, non-newline, non-preprocessor chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-comment, non-newline, non-preprocessor chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNcNnlNpp(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next non-preprocessor or non-comment, non-newline chunk
+    * @param scope code region to search in
+    * @return pointer to next non-preprocessor or non-comment, non-newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNppOrNcNnl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-preprocessor or non-comment, non-newline chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-preprocessor or non-comment, non-newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNppOrNcNnl(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next preprocessor aware non-comment and non-newline chunk
+    *        Unlike Chunk::GetNextNcNnl, this will also ignore a line continuation if
+    *        the starting chunk is in a preprocessor directive, and may return a newline
+    *        if the search reaches the end of a preprocessor directive.
+    * @return pointer to next preprocessor aware non-comment and non-newline chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *PpaGetNextNcNnl() const;
+
+   /**
+    * @brief returns the next non-comment, non-newline, non-empty text chunk
+    * @param scope code region to search in
+    * @return pointer to next non-comment, non-newline, non-empty text chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNcNnlNet(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-comment, non-newline, non-empty text chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-comment, non-newline, non-empty text chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNcNnlNet(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-comment, non-newline, non-ignored chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-comment, non-newline, non-ignored chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNcNnlNi(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next chunk not in or part of balanced square
+    *        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
+    */
+   Chunk *GetNextNisq(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next non-virtual brace chunk
+    * @param scope code region to search in
+    * @return pointer to next non-virtual brace chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNvb(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev non-virtual brace chunk
+    * @param scope code region to search in
+    * @return pointer to prev non-virtual brace chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNvb(const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next chunk of the given type at the level.
+    * @param type    the type to look for
+    * @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 *GetNextType(const E_Token type, const int level = ANY_LEVEL, const E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the prev chunk of the given type at the level.
+    * @param type    the type to look for
+    * @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 *GetPrevType(const E_Token type, int level = ANY_LEVEL, E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the next chunk that holds a given string at a given level.
+    * @param cStr   string to search for
+    * @param len    length of string
+    * @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;
+
+   /**
+    * @brief returns the prev chunk that holds a given string at a given level.
+    * @param cStr   string to search for
+    * @param len    length of string
+    * @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;
+
+   /**
+    * @brief returns the next chunk that is not part of balanced square brackets.
+    * This handles stacked[] instances to accommodate multidimensional arrays.
+    * @return pointer to the next matching chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetNextNbsb() const;
+
+   /**
+    * @brief returns the prev chunk that is not part of balanced square brackets.
+    * This handles stacked[] instances to accommodate multidimensional arrays.
+    * @return pointer to the prev matching chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPrevNbsb() const;
+
+   /**
+    * @brief returns the corresponding start chunk if the given chunk is within a
+    * preprocessor directive, or Chunk::NullChunkPtr otherwise.
+    * @return start chunk of the preprocessor directive or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetPpStart() const;
+
+   /**
+    * @brief Finds the first chunk on the line the current chunk is on.
+    * This just backs up until a newline or nullptr is hit.
+    *
+    * given: [ a - b - c - n1 - d - e - n2 ]
+    * input: [ a | b | c | n1 ] => a
+    * input: [ d | e | n2 ]     => d
+    *
+    * @return pointer to the first chunk on the line the current chunk is on.
+    */
+   Chunk *GetFirstChunkOnLine() const;
+
+
+   // --------- Search functions
+
+   /**
+    * @brief defines a member function pointer for a function of type
+    * Chunk *Chunk::function(const E_Scope scope)
+    * that will search for a new chunk
+    */
+   typedef Chunk *(Chunk::*T_SearchFnPtr)(const E_Scope scope) const;
+
+   /**
+    * @brief defines a member function pointer for a function of type
+    * bool Chunk::function() const;
+    * that checks whether a chunk satisty a specific condition
+    */
+   typedef bool (Chunk::*T_CheckFnPtr)() const;
+
+   /**
+    * @brief determines the search direction to use and returns a pointer
+    *        to the corresponding search function.
+    * @param dir search direction
+    * @return pointer to search function
+    */
+   static T_SearchFnPtr GetSearchFn(const E_Direction dir = E_Direction::FORWARD);
+
+   /**
+    * @brief search for a chunk that satisfies a condition in a chunk list
+    *
+    * A generic function that traverses a chunks list either
+    * in forward or reverse direction. The traversal continues until a
+    * chunk satisfies the condition defined by the compare function.
+    * Depending on the parameter cond the condition will either be
+    * checked to be true or false.
+    *
+    * @param  checkFn  compare function
+    * @param  scope    code parts to consider for search
+    * @param  dir      search direction (forward or backward)
+    * @param  cond     success condition
+    * @return pointer to the found chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *Search(const T_CheckFnPtr checkFn, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD, const bool cond = true) const;
+
+   /**
+    * @brief search for a chunk that satisfies a condition in a chunk list,
+    *        but being aware of preprocessor chucks.
+    *
+    * This function is similar to Search, except that it is tweaked to
+    * handle searches inside of preprocessor directives. Specifically, if the
+    * starting token is inside a preprocessor directive, it will ignore a line
+    * continuation, and will abort the search if it reaches the end of the
+    * directive. This function only searches forward.
+    *
+    * @param  checkFn  compare function
+    * @param  cond     success condition
+    * @return pointer to the found chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *SearchPpa(const T_CheckFnPtr checkFn, const bool cond = true) const;
+
+   /**
+    * @brief search a chunk of a given type and level. Traverses a chunk list in the
+    * specified direction until a chunk of a given type and level is found.
+    *
+    * This function is a specialization of Chunk::Search.
+    *
+    * @param type   category to search for
+    * @param scope  code parts to consider for search
+    * @param dir    search direction
+    * @param level nesting level to match or ANY_LEVEL
+    * @return pointer to the found chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *SearchTypeLevel(const E_Token type, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD, const int level = ANY_LEVEL) const;
+
+   /**
+    * @brief searches a chunk that holds a specific string
+    *
+    * Traverses a chunk list either in forward or backward direction until a chunk
+    * 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  len    length of the string
+    * @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;
+
+   /**
+    * @brief returns the closing match for the current paren/brace/square.
+    * @param scope chunk section to consider
+    * @return pointer to the next matching chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetClosingParen(E_Scope scope = E_Scope::ALL) const;
+
+   /**
+    * @brief returns the opening match for the current paren/brace/square.
+    * @param scope chunk section to consider
+    * @return pointer to the prev matching chunk or Chunk::NullChunkPtr if no chunk was found
+    */
+   Chunk *GetOpeningParen(E_Scope scope = E_Scope::ALL) const;
+
+
+   // --------- Is* functions
+
+   /**
+    * @brief checks whether the chunk is a specific token
+    * @token the token to check for
+    * @return true if the chunk type matches the specified token, false otherwise
+    */
+   bool Is(E_Token token) const;
+
+   /**
+    * @brief checks whether the chunk token name is a specific string
+    * @param cStr 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;
+
+   /**
+    * @brief checks whether the chunk is not a specific token
+    * @token the token to check for
+    * @return true if the chunk type does not matches the specified token, false otherwise
+    */
+   bool IsNot(E_Token token) const;
+
+   /**
+    * @brief checks whether the chunk is a newline
+    * @return true if the chunk is a newline, false otherwise
+    */
+   bool IsNewline() const;
+
+   /**
+    * @brief checks whether the chunk is a comment
+    * This means any kind of:
+    *   - single line comment
+    *   - multiline comment
+    *   - C comment
+    *   - C++ comment
+    */
+   bool IsComment() const;
+
+   /**
+    * @brief checks whether the chunk is valid and has an empty text
+    * @return true if the chunk is valid and has an empty text
+    */
+   bool IsEmptyText() const;
+
+   /**
+    * @brief checks whether the chunk is a preprocessor
+    * @return true if the chunk is a preprocessor, false otherwise
+    */
+   bool IsPreproc() const;
+
+   /**
+    * @brief checks whether the other chunk has the same preproc flags
+    * @return true if the other chunk has the same preproc flags
+    */
+   bool IsSamePreproc(const Chunk *other) const;
+
+   /**
+    * @brief checks whether the chunk is either a comment or a newline
+    * @return true if the chunk is either a comment or a newline, false otherwise
+    */
+   bool IsCommentOrNewline() const;
+
+   /**
+    * @brief checks whether the chunk is either a comment, a newline or ignored
+    * @return true if the chunk is either a comment, a newline or ignored, false otherwise
+    */
+   bool IsCommentNewlineOrIgnored() const;
+
+   /**
+    * @brief checks whether the chunk is a comment, a newline or a preprocessor
+    * @return true if the chunk is a comment, a newline or a preprocessor, false otherwise
+    */
+   bool IsCommentNewlineOrPreproc() const;
+
+   /**
+    * @brief checks whether the chunk is a preprocessor and either a comment or a newline
+    * @return true if the chunk is a preprocessor and either a comment or a newline, false otherwise
+    */
+   bool IsCommentOrNewlineInPreproc() const;
+
+   /**
+    * @brief checks whether the chunk is a comment, a newline or has an empty text
+    * @return true if the chunk is a comment, a newline or has an empty text
+    */
+   bool IsCommentNewlineOrEmptyText() const;
+
+   /**
+    * @brief checks whether the chunk is a single line comment
+    * @return true if the chunk is a single line comment
+    */
+   bool IsSingleLineComment() const;
+
+   /**
+    * @brief checks whether the chunk is a Doxygen comment
+    * @return true if the chunk is a Doxygen comment
+    */
+   bool IsDoxygenComment() const;
+
+   /**
+    * @brief checks whether the chunk is a square bracket
+    * @return true if the chunk is a square bracket
+    */
+   bool IsSquareBracket() const;
+
+   /**
+    * @brief checks whether the chunk is a virtual brace
+    * @return true if the chunk is a virtual brace
+    */
+   bool IsVBrace() const;
+
+   /**
+    * @brief checks whether the chunk matches a given type and level
+    * @param type  category to search for
+    * @param level nesting level to match
+    * @return true if the chunk matches a given type and level
+    */
+   bool IsTypeAndLevel(const E_Token type, const int level) const;
+
+   /**
+    * @brief checks whether the chunk matches a given string and level
+    * @param cStr   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;
+
+   /**
+    * @brief checks whether the chunk is a star/asterisk
+    * @return true if the chunk is a star/asterisk
+    */
+   bool IsStar() const;
+
+   /**
+    * @brief checks whether the chunk is a colon
+    * @return true if the chunk is a colon
+    */
+   bool IsColon() const;
+
+   /**
+    * @brief checks whether the chunk is a semicolon
+    * @return true if the chunk is a semicolon
+    */
+   bool IsSemicolon() const;
+
+   /**
+    * @brief checks whether the chunk is a pointer operator
+    * @return true if the chunk is a pointer operator
+    */
+   bool IsPointerOperator() const;
+
+   /**
+    * @brief checks whether the chunk is a pointer or a reference
+    * @return true if the chunk is a pointer or a reference
+    */
+   bool IsPointerOrReference() const;
+
+   /**
+    * @brief checks whether the chunk is an inheritance access specifier
+    * @return true if the chunk is an inheritance access specifier
+    */
+   bool IsCppInheritanceAccessSpecifier() const;
+
+   /**
+    * @brief checks whether the chunk is a pointer, reference or a qualifier
+    * @return true if the chunk is a pointer, reference or a qualifier
+    */
+   bool IsPointerReferenceOrQualifier() const;
+
+   /**
+    * @brief checks whether the chunk is an address
+    * @return true if the chunk is an address
+    */
+   bool IsAddress() const;
+
+   /**
+    * @brief checks whether the chunk is a MS reference
+    * @return true if the chunk is a MS reference
+    * NOTE: MS compilers for C++/CLI and WinRT use '^' instead of '*'
+    * for marking up reference types vs pointer types
+    */
+   bool IsMsRef() const;
+
+   /**
+    * @brief checks whether the chunk is nullable
+    * @return true if the chunk is nullable
+    */
+   bool IsNullable() const;
+
+   /**
+    * @brief Checks if a given chunk is the last on its line
+    * @return true or false depending on whether a given chunk is the last on its line
+    */
+   bool IsLastChunkOnLine() const;
+
+   /**
+    * @brief checks whether the current chunk is on same line of the given 'end' chunk.
+    * The current chunk must be before the 'end' chunk
+    * @param end the end chunk
+    * @return true if there is no newline between the current chunk and end chunk
+    */
+   bool IsOnSameLine(const Chunk *end) const;
+
+   /**
+    * @brief checks whether the chunk is an opening brace
+    * @return true if the chunk is an opening brace
+    */
+   bool IsBraceOpen() const;
+
+   /**
+    * @brief checks whether the chunk is a closing brace
+    * @return true if the chunk is a closing brace
+    */
+   bool IsBraceClose() const;
+
+   /**
+    * @brief checks whether the chunk is an opening parenthesis
+    * @return true if the chunk is an opening parenthesis
+    */
+   bool IsParenOpen() const;
+
+   /**
+    * @brief checks whether the chunk is a closing parenthesis
+    * @return true if the chunk is a closing parenthesis
+    */
+   bool IsParenClose() const;
+
+   /**
+    * @brief checks if a chunk points to the opening parentheses of a
+    * for (...in...) loop in Objective-C.
+    * @return true  if the chunk is the opening parentheses of a for-in loop
+    */
+   bool IsOCForinOpenParen() const;
+
+   /**
+    * @brief checks whether the chunk is a type defining token
+    * @return true if the chunk is a type defining token
+    */
+   bool IsTypeDefinition() const;
+
+   /**
+    * @brief checks whether the chunk is a word
+    * @return true if the chunk is a word
+    */
+   bool IsWord() const;
+
+   /**
+    * @brief checks whether the chunk is an enum or an enum class
+    * @return true if the chunk is an enum or an enum class
+    */
+   bool IsEnum() const;
+
+   /**
+    * @brief checks whether the chunk is a class or a struct
+    * @return true if the chunk is a class or a struct
+    */
+   bool IsClassOrStruct() const;
+
+   /**
+    * @brief checks whether the chunk is a class, struct or union
+    * @return true if the chunk is a class, struct or union
+    */
+   bool IsClassStructOrUnion() const;
+
+   /**
+    * @brief checks whether the chunk is a class, enum, struct or union
+    * @return true if the chunk is a class, enum, struct or union
+    */
+   bool IsClassEnumStructOrUnion() const;
+
+   /**
+    * @brief checks whether there is a newline between this chunk and the other
+    * @return true if there is a newline between this chunk and the other
+    */
+   bool IsNewlineBetween(const Chunk *other) const;
+
+
+   // --------- Util functions
+
+   /**
+    * @brief delete the chunk from the chunk list
+    * @param pc the chunk to remove from the list
+    */
+   static void Delete(Chunk * &pc);
+
+   /**
+    * @brief add a copy of this chunk after the given position in a chunk list.
+    * @note If pos is NullChunk, add at the tail of the chunk list
+    * @param pos insert position in list
+    * @return pointer to the newly added chunk
+    */
+   Chunk *CopyAndAddAfter(Chunk *pos) const;
+
+   /**
+    * @brief add a copy of this chunk before the given position in a chunk list.
+    * @note If pos is NullChunk, add at the head of the chunk list
+    * @param pos insert position in list
+    * @return pointer to the newly added chunk
+    */
+   Chunk *CopyAndAddBefore(Chunk *pos) const;
+
+   /**
+    * @brief move the chunk after the reference position in the chunk list
+    * @param ref chunk after which to move the current chunk
+    */
+   void MoveAfter(Chunk *ref);
+
+   /**
+    * @brief swaps the place of this chunk with the given one
+    * @param other the other chunk
+    */
+   void Swap(Chunk *other);
+
+   /**
+    * @brief swaps the two lines that are started by the current chunk and the other chunk
+    * @param other the other chunk
+    */
+   void SwapLines(Chunk *other);
+
+   //!
+   /**
+    * @brief skips to the final word/type in a :: chain
+    * @return pointer to the chunk after the final word/type in a :: chain
+    */
+   Chunk *SkipDcMember() const;
+
+   /**
+    * @brief compare the positions of the chunk with another one
+    * @param other the other chunk
+    * @return returns -1 if this chunk comes first, +1 if it comes after, or 0.
+    */
+   int ComparePosition(const Chunk *other) const;
+
+   /**
+    * Returns true if it is safe to delete the newline token.
+    * The prev and next chunks must have the same PCF_IN_PREPROC flag AND
+    * the newline can't be after a C++ comment.
+    */
+   bool SafeToDeleteNl() const;
+
+
+protected:
+   // --------- Protected util functions
+
+   /**
+    * @brief copy the values from another chunk.
+    * @NOTE: this is a partial copy only: the chunk is not linked to others
+    * @param o the chunk to copy from
+    */
+   void CopyFrom(const Chunk &o);
+
+   /**
+    * @brief add a copy of this chunk before/after the given position in a chunk list.
+    * @note If pos is NullChunk, add the new chuck either at the head or tail of the
+    * list based on the specified direction.
+    * @param pos insert position in list
+    * @param dir insert before or after the given position chunk
+    * @return pointer to the newly added chunk
+    */
+   Chunk *CopyAndAdd(Chunk *pos, const E_Direction dir = E_Direction::FORWARD) const;
+
+   /**
+    * @brief set and/or clear the chunk flags
+    * @param setBits the flag bits to set
+    * @param resetBits the flag bits to reset
+    */
+   void SetResetFlags(T_PcfFlags resetBits, T_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
+
+
+private:
+   const bool null_chunk;                     //! true for null chunks
+
+
+public:
+   static Chunk        NullChunk;             //! Null Chunk
+   static Chunk *const NullChunkPtr;          //! Pointer to the Null Chunk
+};
+
+
+inline Chunk::Chunk(bool null_c)
+   : null_chunk(null_c)
+{
+   Reset();
+}
+
+
+inline Chunk::Chunk(const Chunk &o)
+   : null_chunk(o.null_chunk)
+{
+   CopyFrom(o);
+}
+
+
+inline Chunk &Chunk::operator=(const Chunk &o)
+{
+   if (this != &o)
+   {
+      CopyFrom(o);
+   }
+   return(*this);
+}
+
+
+inline size_t Chunk::Len() const
+{
+   return(m_str.size());
+}
+
+
+inline const char *Chunk::Text() const
+{
+   return(m_str.c_str());
+}
+
+
+inline Chunk *Chunk::GetParent() const
+{
+   return(m_parent);
+}
+
+
+inline void Chunk::SetParent(Chunk *parent)
+{
+   if (this != parent)
+   {
+      m_parent = parent;
+   }
+}
+
+
+inline const T_AlignData &Chunk::GetAlignmentData() const
+{
+   return(m_alignmentData);
+}
+
+
+inline T_AlignData &Chunk::AlignmentData()
+{
+   return(m_alignmentData);
+}
+
+
+inline const T_IndentData &Chunk::GetIndentData() const
+{
+   return(m_indentData);
+}
+
+
+inline T_IndentData &Chunk::IndentData()
+{
+   return(m_indentData);
+}
+
+
+inline const unc_text &Chunk::GetStr() const
+{
+   return(m_str);
+}
+
+
+inline unc_text &Chunk::Str()
+{
+   return(m_str);
+}
+
+
+inline const track_list *Chunk::GetTrackingData() const
+{
+   return(m_trackingData);
+}
+
+
+inline track_list * &Chunk::TrackingData()
+{
+   return(m_trackingData);
+}
+
+
+inline E_Token Chunk::GetType() const
+{
+   return(m_type);
+}
+
+
+inline E_Token Chunk::GetParentType() const
+{
+   return(m_parentType);
+}
+
+
+inline E_Token Chunk::GetTypeOfParent() const
+{
+   if (GetParent()->IsNullChunk())
+   {
+      return(CT_PARENT_NOT_SET);
+   }
+   return(GetParent()->GetType());
+}
+
+
+inline T_PcfFlags Chunk::GetFlags() const
+{
+   return(m_flags);
+}
+
+
+inline void Chunk::SetFlags(T_PcfFlags flags)
+{
+   m_flags = flags;
+}
+
+
+inline bool Chunk::TestFlags(T_PcfFlags flags) const
+{
+   return(m_flags.test(flags));
+}
+
+
+inline void Chunk::ResetFlagBits(T_PcfFlags resetBits)
+{
+   SetResetFlags(resetBits, PCF_NONE);
+}
+
+
+inline void Chunk::SetFlagBits(T_PcfFlags setBits)
+{
+   SetResetFlags(PCF_NONE, setBits);
+}
+
+
+inline void Chunk::UpdateFlagBits(T_PcfFlags resetBits, T_PcfFlags setBits)
+{
+   SetResetFlags(resetBits, setBits);
+}
+
+
+inline size_t Chunk::GetOrigLine() const
+{
+   return(m_origLine);
+}
+
+
+inline void Chunk::SetOrigLine(size_t line)
+{
+   m_origLine = line;
+}
+
+
+inline size_t Chunk::GetOrigCol() const
+{
+   return(m_origCol);
+}
+
+
+inline void Chunk::SetOrigCol(size_t col)
+{
+   m_origCol = col;
+}
+
+
+inline size_t Chunk::GetOrigColEnd() const
+{
+   return(m_origColEnd);
+}
+
+
+inline void Chunk::SetOrigColEnd(size_t col)
+{
+   m_origColEnd = col;
+}
+
+
+inline size_t Chunk::GetOrigPrevSp() const
+{
+   return(m_origPrevSp);
+}
+
+
+inline void Chunk::SetOrigPrevSp(size_t col)
+{
+   m_origPrevSp = col;
+}
+
+
+inline size_t Chunk::GetColumn() const
+{
+   return(m_column);
+}
+
+
+inline void Chunk::SetColumn(size_t col)
+{
+   m_column = col;
+}
+
+
+inline size_t Chunk::GetColumnIndent() const
+{
+   return(m_columnIndent);
+}
+
+
+inline void Chunk::SetColumnIndent(size_t col)
+{
+   m_columnIndent = col;
+}
+
+
+inline size_t Chunk::GetNlCount() const
+{
+   return(m_nlCount);
+}
+
+
+inline void Chunk::SetNlCount(size_t cnt)
+{
+   m_nlCount = cnt;
+}
+
+
+inline size_t Chunk::GetNlColumn() const
+{
+   return(m_nlColumn);
+}
+
+
+inline void Chunk::SetNlColumn(size_t col)
+{
+   m_nlColumn = col;
+}
+
+
+inline size_t Chunk::GetLevel() const
+{
+   return(m_level);
+}
+
+
+inline void Chunk::SetLevel(size_t level)
+{
+   m_level = level;
+}
+
+
+inline size_t Chunk::GetBraceLevel() const
+{
+   return(m_braceLevel);
+}
+
+
+inline void Chunk::SetBraceLevel(size_t lvl)
+{
+   m_braceLevel = lvl;
+}
+
+
+inline size_t Chunk::GetPpLevel() const
+{
+   return(m_ppLevel);
+}
+
+
+inline void Chunk::SetPpLevel(size_t lvl)
+{
+   m_ppLevel = lvl;
+}
+
+
+inline bool Chunk::GetAfterTab() const
+{
+   return(m_afterTab);
+}
+
+
+inline void Chunk::SetAfterTab(bool afterTab)
+{
+   m_afterTab = afterTab;
+}
+
+
+inline Chunk *Chunk::GetNextNl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsNewline, scope, E_Direction::FORWARD, true));
+}
+
+
+inline Chunk *Chunk::GetPrevNl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsNewline, scope, E_Direction::BACKWARD, true));
+}
+
+
+inline Chunk *Chunk::GetNextNnl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsNewline, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNnl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsNewline, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline Chunk *Chunk::GetNextNc(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsComment, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNc(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsComment, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline Chunk *Chunk::GetNextNcNnl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentOrNewline, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNcNnl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentOrNewline, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline Chunk *Chunk::GetNextNcNnlNpp(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentNewlineOrPreproc, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNcNnlNpp(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentNewlineOrPreproc, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline Chunk *Chunk::GetNextNppOrNcNnl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentOrNewlineInPreproc, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNppOrNcNnl(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentOrNewlineInPreproc, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline Chunk *Chunk::PpaGetNextNcNnl() const
+{
+   return(SearchPpa(&Chunk::IsCommentOrNewline, false));
+}
+
+
+inline Chunk *Chunk::GetNextNcNnlNet(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentNewlineOrEmptyText, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNcNnlNet(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentNewlineOrEmptyText, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNcNnlNi(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsCommentNewlineOrIgnored, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline Chunk *Chunk::GetNextNisq(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsSquareBracket, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetNextType(const E_Token type, const int level, const E_Scope scope) const
+{
+   return(SearchTypeLevel(type, scope, E_Direction::FORWARD, level));
+}
+
+
+inline Chunk *Chunk::GetPrevType(const E_Token type, const int level, const E_Scope scope) const
+{
+   return(SearchTypeLevel(type, scope, E_Direction::BACKWARD, level));
+}
+
+
+inline Chunk *Chunk::GetNextString(const char *cStr, const size_t len, const int level, const E_Scope scope) const
+{
+   return(SearchStringLevel(cStr, 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
+{
+   return(SearchStringLevel(cStr, len, level, scope, E_Direction::BACKWARD));
+}
+
+
+inline Chunk *Chunk::GetNextNvb(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsVBrace, scope, E_Direction::FORWARD, false));
+}
+
+
+inline Chunk *Chunk::GetPrevNvb(const E_Scope scope) const
+{
+   return(Search(&Chunk::IsVBrace, scope, E_Direction::BACKWARD, false));
+}
+
+
+inline bool Chunk::IsTypeAndLevel(const E_Token type, const int level) const
+{
+   return(  (  level < 0
+            || m_level == static_cast<size_t>(level))
+         && m_type == type);
+}
+
+
+inline bool Chunk::Is(E_Token token) const
+{
+   return(  IsNotNullChunk()
+         && m_type == token);
+}
+
+
+inline bool Chunk::IsString(const char *cStr, bool caseSensitive) const
+{
+   return(IsStringAndLevel(cStr, strlen(cStr), caseSensitive, ANY_LEVEL));
+}
+
+
+inline bool Chunk::IsNot(E_Token token) const
+{
+   return(!Is(token));
+}
+
+
+inline bool Chunk::IsNewline() const
+{
+   return(  Is(CT_NEWLINE)
+         || Is(CT_NL_CONT));
+}
+
+
+inline bool Chunk::IsComment() const
+{
+   return(  Is(CT_COMMENT)
+         || Is(CT_COMMENT_MULTI)
+         || Is(CT_COMMENT_CPP));
+}
+
+
+inline bool Chunk::IsEmptyText() const
+{
+   return(  IsNotNullChunk()
+         && Len() == 0);
+}
+
+
+inline bool Chunk::IsPreproc() const
+{
+   return(  IsNotNullChunk()
+         && TestFlags(PCF_IN_PREPROC));
+}
+
+
+inline bool Chunk::IsCommentOrNewline() const
+{
+   return(  IsComment()
+         || IsNewline());
+}
+
+
+inline bool Chunk::IsCommentNewlineOrPreproc() const
+{
+   return(  IsComment()
+         || IsNewline()
+         || IsPreproc());
+}
+
+
+inline bool Chunk::IsCommentOrNewlineInPreproc() const
+{
+   return(  IsPreproc()
+         && (  IsComment()
+            || IsNewline()));
+}
+
+
+inline bool Chunk::IsCommentNewlineOrEmptyText() const
+{
+   return(  IsComment()
+         || IsNewline()
+         || IsEmptyText());
+}
+
+
+inline bool Chunk::IsCommentNewlineOrIgnored() const
+{
+   return(  IsComment()
+         || IsNewline()
+         || Is(CT_IGNORED));
+}
+
+
+inline bool Chunk::IsSingleLineComment() const
+{
+   return(  Is(CT_COMMENT)
+         || Is(CT_COMMENT_CPP));
+}
+
+
+inline bool Chunk::IsSquareBracket() const
+{
+   return(  Is(CT_SQUARE_OPEN)
+         || Is(CT_TSQUARE)
+         || Is(CT_SQUARE_CLOSE));
+}
+
+
+inline bool Chunk::IsVBrace() const
+{
+   return(  Is(CT_VBRACE_OPEN)
+         || Is(CT_VBRACE_CLOSE));
+}
+
+
+inline bool Chunk::IsStar() const
+{
+   return(  Len() == 1
+         && m_str[0] == '*'
+         && IsNot(CT_OPERATOR_VAL));
+}
+
+
+inline bool Chunk::IsSemicolon() const
+{
+   return(  Is(CT_SEMICOLON)
+         || Is(CT_VSEMICOLON));
+}
+
+
+inline bool Chunk::IsWord() const
+{
+   return(  Len() >= 1
+         && CharTable::IsKw1(m_str[0]));
+}
+
+
+inline bool Chunk::IsNullable() const
+{
+   return(  language_is_set(LANG_CS | LANG_VALA)
+         && Len() == 1
+         && m_str[0] == '?');
+}
+
+
+inline bool Chunk::IsMsRef() const
+{
+   return(  language_is_set(LANG_CPP)
+         && Len() == 1
+         && m_str[0] == '^'
+         && IsNot(CT_OPERATOR_VAL));
+}
+
+
+inline bool Chunk::IsPointerOperator() const
+{
+   return(  IsStar()
+         || IsAddress()
+         || IsMsRef()
+         || IsNullable());
+}
+
+
+inline bool Chunk::IsPointerOrReference() const
+{
+   return(  IsPointerOperator()
+         || Is(CT_BYREF));
+}
+
+
+inline bool Chunk::IsBraceOpen() const
+{
+   return(  Is(CT_BRACE_OPEN)
+         || Is(CT_VBRACE_OPEN));
+}
+
+
+inline bool Chunk::IsBraceClose() const
+{
+   return(  Is(CT_BRACE_CLOSE)
+         || Is(CT_VBRACE_CLOSE));
+}
+
+
+inline bool Chunk::IsParenOpen() const
+{
+   return(  Is(CT_PAREN_OPEN)
+         || Is(CT_SPAREN_OPEN)
+         || Is(CT_PPAREN_OPEN)
+         || Is(CT_TPAREN_OPEN)
+         || Is(CT_FPAREN_OPEN)
+         || Is(CT_LPAREN_OPEN));
+}
+
+
+inline bool Chunk::IsParenClose() const
+{
+   return(  Is(CT_PAREN_CLOSE)
+         || Is(CT_SPAREN_CLOSE)
+         || Is(CT_PPAREN_CLOSE)
+         || Is(CT_TPAREN_CLOSE)
+         || Is(CT_FPAREN_CLOSE)
+         || Is(CT_LPAREN_CLOSE));
+}
+
+
+inline bool Chunk::IsSamePreproc(const Chunk *other) const
+{
+   return(  IsNotNullChunk()
+         && other->IsNotNullChunk()
+         && (TestFlags(PCF_IN_PREPROC) == other->TestFlags(PCF_IN_PREPROC)));
+}
+
+
+inline bool Chunk::SafeToDeleteNl() const
+{
+   Chunk *tmp = GetPrev();
+
+   if (tmp->Is(CT_COMMENT_CPP))
+   {
+      return(false);
+   }
+   return(tmp->IsSamePreproc(GetNext()));
+}
+
+
+inline bool Chunk::IsEnum() const
+{
+   return(  Is(CT_ENUM)
+         || Is(CT_ENUM_CLASS));
+}
+
+
+inline bool Chunk::IsClassOrStruct() const
+{
+   return(  Is(CT_CLASS)
+         || Is(CT_STRUCT));
+}
+
+
+inline bool Chunk::IsClassStructOrUnion() const
+{
+   return(  IsClassOrStruct()
+         || Is(CT_UNION));
+}
+
+
+inline bool Chunk::IsClassEnumStructOrUnion() const
+{
+   return(  IsClassStructOrUnion()
+         || IsEnum());
+}
+
+
+inline Chunk *Chunk::CopyAndAddAfter(Chunk *ref) const
+{
+   return(CopyAndAdd(ref, E_Direction::FORWARD));
+}
+
+
+inline Chunk *Chunk::CopyAndAddBefore(Chunk *ref) const
+{
+   return(CopyAndAdd(ref, E_Direction::BACKWARD));
+}
+
+
+#define SetType(tt)          SetTypeReal((tt), __unqualified_func__, __LINE__)
+
+
+#define SetParentType(tt)    SetParentTypeReal((tt), __unqualified_func__, __LINE__)
+
+
+#endif /* CHUNK_LIST_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.cpp
index f21d106c..d7f95472 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.cpp
@@ -16,9 +16,11 @@
 #include "flag_braced_init_list.h"
 #include "flag_parens.h"
 #include "lang_pawn.h"
+#include "mark_question_colon.h"
 #include "newlines.h"
 #include "prototypes.h"
 #include "tokenize_cleanup.h"
+#include "unc_tools.h"
 
 #include <limits>
 
@@ -38,28 +40,22 @@ static void flag_asm(Chunk *pc);
 
 
 /**
- * Skips the list of class/struct parent types.
- */
-Chunk *skip_parent_types(Chunk *colon);
-
-
-/**
  * Combines two tokens into {{ and }} if inside parens and nothing is between
  * either pair.
  */
 static void check_double_brace_init(Chunk *bo1);
 
 
-static void process_returns(void);
+static void process_returns_and_throws();
 
 
 /**
- * Processes a return statement, labeling the parens and marking the parent.
- * May remove or add parens around the return statement
+ * Processes a 'return' or 'throw' statement, labeling the parens and marking
+ * the parent. May remove or add parens around the return/throw statement.
  *
- * @param pc  Pointer to the return chunk
+ * @param pc  Pointer to the return or throw chunk
  */
-static Chunk *process_return(Chunk *pc);
+static Chunk *process_return_or_throw(Chunk *pc);
 
 
 /**
@@ -149,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, pcf_flags_t flags, bool &did_it);
+static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, T_PcfFlags flags, bool &did_it);
 
 /**
  * Process an C# [] thingy:
@@ -256,53 +252,53 @@ static void flag_asm(Chunk *pc)
 
    Chunk *tmp = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-   if (chunk_is_not_token(tmp, CT_QUALIFIER))
+   if (tmp->IsNot(CT_QUALIFIER))
    {
       return;
    }
    Chunk *po = tmp->GetNextNcNnl(E_Scope::PREPROC);
 
-   if (!chunk_is_paren_open(po))
+   if (!po->IsParenOpen())
    {
       return;
    }
-   Chunk *end = chunk_skip_to_match(po, E_Scope::PREPROC);
+   Chunk *end = po->GetClosingParen(E_Scope::PREPROC);
 
-   if (end == nullptr)
+   if (end->IsNullChunk())
    {
       return;
    }
-   set_chunk_parent(po, CT_ASM);
-   set_chunk_parent(end, CT_ASM);
+   po->SetParentType(CT_ASM);
+   end->SetParentType(CT_ASM);
 
    for (  tmp = po->GetNextNcNnl(E_Scope::PREPROC);
           tmp->IsNotNullChunk()
        && tmp != end;
           tmp = tmp->GetNextNcNnl(E_Scope::PREPROC))
    {
-      if (chunk_is_token(tmp, CT_COLON))
+      if (tmp->Is(CT_COLON))
       {
-         set_chunk_type(tmp, CT_ASM_COLON);
+         tmp->SetType(CT_ASM_COLON);
       }
-      else if (chunk_is_token(tmp, CT_DC_MEMBER))
+      else if (tmp->Is(CT_DC_MEMBER))
       {
          // if there is a string on both sides, then this is two ASM_COLONs
-         if (  chunk_is_token(tmp->GetNextNcNnl(E_Scope::PREPROC), CT_STRING)
-            && chunk_is_token(tmp->GetPrevNcNnlNi(E_Scope::PREPROC), CT_STRING)) // Issue #2279
+         if (  tmp->GetNextNcNnl(E_Scope::PREPROC)->Is(CT_STRING)
+            && tmp->GetPrevNcNnlNi(E_Scope::PREPROC)->Is(CT_STRING)) // Issue #2279
          {
             Chunk nc;
 
             nc = *tmp;
 
-            tmp->str.resize(1);
-            tmp->orig_col_end = tmp->orig_col + 1;
-            set_chunk_type(tmp, CT_ASM_COLON);
+            tmp->Str().resize(1);
+            tmp->SetOrigColEnd(tmp->GetOrigCol() + 1);
+            tmp->SetType(CT_ASM_COLON);
 
-            set_chunk_type(&nc, tmp->type);
-            nc.str.pop_front();
-            nc.orig_col++;
-            nc.column++;
-            chunk_add_after(&nc, tmp);
+            nc.SetType(tmp->GetType());
+            nc.Str().pop_front();
+            nc.SetOrigCol(nc.GetOrigCol() + 1);
+            nc.SetColumn(nc.GetColumn() + 1);
+            nc.CopyAndAddAfter(tmp);
          }
       }
    }
@@ -314,9 +310,9 @@ static void flag_asm(Chunk *pc)
       return;
    }
 
-   if (chunk_is_token(tmp, CT_SEMICOLON))
+   if (tmp->Is(CT_SEMICOLON))
    {
-      set_chunk_parent(tmp, CT_ASM);
+      tmp->SetParentType(CT_ASM);
    }
 } // flag_asm
 
@@ -326,109 +322,109 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    LOG_FUNC_ENTRY();
    LOG_FMT(LFCNR, "%s(%d): prev is '%s' %s\n",
            __func__, __LINE__,
-           prev->Text(), get_token_name(prev->type));
-   log_pcf_flags(LFCNR, prev->flags);
+           prev->Text(), get_token_name(prev->GetType()));
+   log_pcf_flags(LFCNR, prev->GetFlags());
    LOG_FMT(LFCNR, "%s(%d): pc is '%s' %s\n",
            __func__, __LINE__,
-           pc->Text(), get_token_name(pc->type));
-   log_pcf_flags(LFCNR, pc->flags);
+           pc->Text(), get_token_name(pc->GetType()));
+   log_pcf_flags(LFCNR, pc->GetFlags());
    LOG_FMT(LFCNR, "%s(%d): next is '%s' %s\n",
            __func__, __LINE__,
-           next->Text(), get_token_name(next->type));
-   log_pcf_flags(LFCNR, next->flags);
+           next->Text(), get_token_name(next->GetType()));
+   log_pcf_flags(LFCNR, next->GetFlags());
 
-   if (  chunk_is_token(pc, CT_NOEXCEPT)                 // Issue #3284
-      && chunk_is_token(next, CT_ASSIGN))                // skip over noexcept
+   if (  pc->Is(CT_NOEXCEPT)                 // Issue #3284
+      && next->Is(CT_ASSIGN))                // skip over noexcept
    {
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+      LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
       pc   = next;
       next = pc->GetNext();
    }
 
    // separate the uses of CT_ASSIGN sign '='
    // into CT_ASSIGN_DEFAULT_ARG, CT_ASSIGN_FUNC_PROTO
-   if (  chunk_is_token(pc, CT_ASSIGN)
-      && get_chunk_parent_type(pc) == CT_FUNC_PROTO
-      && (  pc->flags.test(PCF_IN_FCN_DEF)                            // Issue #2236
-         || pc->flags.test(PCF_IN_CONST_ARGS)))
-   {
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-      log_pcf_flags(LFCNR, pc->flags);
-      set_chunk_type(pc, CT_ASSIGN_DEFAULT_ARG);
+   if (  pc->Is(CT_ASSIGN)
+      && pc->GetParentType() == CT_FUNC_PROTO
+      && (  pc->TestFlags(PCF_IN_FCN_DEF)                            // Issue #2236
+         || pc->TestFlags(PCF_IN_CONST_ARGS)))
+   {
+      LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+      log_pcf_flags(LFCNR, pc->GetFlags());
+      pc->SetType(CT_ASSIGN_DEFAULT_ARG);
       return;
    }
 
-   if (  (  chunk_is_token(prev, CT_FPAREN_CLOSE)
-         || (  (  chunk_is_str(prev, "const")
-               || chunk_is_str(prev, "override"))
-            && chunk_is_token(prev->prev, CT_FPAREN_CLOSE)))
-      && chunk_is_token(pc, CT_ASSIGN)
-      && (  chunk_is_token(next, CT_DEFAULT)
-         || chunk_is_token(next, CT_DELETE)
-         || chunk_is_str(next, "0")))
+   if (  (  prev->Is(CT_FPAREN_CLOSE)
+         || (  (  prev->IsString("const")
+               || prev->IsString("override"))
+            && prev->GetPrev()->Is(CT_FPAREN_CLOSE)))
+      && pc->Is(CT_ASSIGN)
+      && (  next->Is(CT_DEFAULT)
+         || next->Is(CT_DELETE)
+         || next->IsString("0")))
    {
-      set_chunk_type(pc, CT_ASSIGN_FUNC_PROTO);
+      pc->SetType(CT_ASSIGN_FUNC_PROTO);
       return;                  // cpp 30031
    }
 
-   if (chunk_is_token(pc, CT_OC_AT))
+   if (pc->Is(CT_OC_AT))
    {
-      if (  chunk_is_token(next, CT_PAREN_OPEN)
-         || chunk_is_token(next, CT_BRACE_OPEN)
-         || chunk_is_token(next, CT_SQUARE_OPEN))
+      if (  next->Is(CT_PAREN_OPEN)
+         || next->Is(CT_BRACE_OPEN)
+         || next->Is(CT_SQUARE_OPEN))
       {
-         flag_parens(next, PCF_OC_BOXED, next->type, CT_OC_AT, false);
+         flag_parens(next, PCF_OC_BOXED, next->GetType(), CT_OC_AT, false);
       }
       else
       {
-         set_chunk_parent(next, CT_OC_AT);
+         next->SetParentType(CT_OC_AT);
          return;                  // objective-c_50095
       }
    }
 
    // D stuff
    if (  language_is_set(LANG_D)
-      && chunk_is_token(pc, CT_QUALIFIER)
-      && chunk_is_str(pc, "const")
-      && chunk_is_token(next, CT_PAREN_OPEN))
+      && pc->Is(CT_QUALIFIER)
+      && pc->IsString("const")
+      && next->Is(CT_PAREN_OPEN))
    {
-      set_chunk_type(pc, CT_D_CAST);
-      set_paren_parent(next, pc->type);
+      pc->SetType(CT_D_CAST);
+      set_paren_parent(next, pc->GetType());
       return;                  // d_40061
    }
 
-   if (  chunk_is_token(next, CT_PAREN_OPEN)
-      && (  chunk_is_token(pc, CT_D_CAST)
-         || chunk_is_token(pc, CT_DELEGATE)
-         || chunk_is_token(pc, CT_ALIGN)))
+   if (  next->Is(CT_PAREN_OPEN)
+      && (  pc->Is(CT_D_CAST)
+         || pc->Is(CT_DELEGATE)
+         || pc->Is(CT_ALIGN)))
    {
       // mark the parenthesis parent
-      Chunk *tmp = set_paren_parent(next, pc->type);
+      Chunk *tmp = set_paren_parent(next, pc->GetType());
 
       // For a D cast - convert the next item
-      if (  chunk_is_token(pc, CT_D_CAST)
+      if (  pc->Is(CT_D_CAST)
          && tmp != nullptr)
       {
-         if (chunk_is_token(tmp, CT_STAR))
+         if (tmp->Is(CT_STAR))
          {
-            set_chunk_type(tmp, CT_DEREF);
+            tmp->SetType(CT_DEREF);
             return;                  // d_40006
          }
-         else if (chunk_is_token(tmp, CT_AMP))
+         else if (tmp->Is(CT_AMP))
          {
-            set_chunk_type(tmp, CT_ADDR);
+            tmp->SetType(CT_ADDR);
             return;                  // d_40060
          }
-         else if (chunk_is_token(tmp, CT_MINUS))
+         else if (tmp->Is(CT_MINUS))
          {
-            set_chunk_type(tmp, CT_NEG);
+            tmp->SetType(CT_NEG);
             return;                  // d_40060
          }
-         else if (chunk_is_token(tmp, CT_PLUS))
+         else if (tmp->Is(CT_PLUS))
          {
-            set_chunk_type(tmp, CT_POS);
+            tmp->SetType(CT_POS);
             return;                  // d_40060
          }
       }
@@ -437,23 +433,23 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
        * For a delegate, mark previous words as types and the item after the
        * close paren as a variable def
        */
-      if (chunk_is_token(pc, CT_DELEGATE))
+      if (pc->Is(CT_DELEGATE))
       {
          if (tmp != nullptr)
          {
-            set_chunk_parent(tmp, CT_DELEGATE);
+            tmp->SetParentType(CT_DELEGATE);
 
-            if (tmp->level == tmp->brace_level)
+            if (tmp->GetLevel() == tmp->GetBraceLevel())
             {
-               chunk_flags_set(tmp, PCF_VAR_1ST_DEF);
+               tmp->SetFlagBits(PCF_VAR_1ST_DEF);
             }
          }
 
          for (tmp = pc->GetPrevNcNnlNi(); tmp->IsNotNullChunk(); tmp = tmp->GetPrevNcNnlNi()) // Issue #2279
          {
-            if (  chunk_is_semicolon(tmp)
-               || chunk_is_token(tmp, CT_BRACE_OPEN)
-               || chunk_is_token(tmp, CT_VBRACE_OPEN))
+            if (  tmp->IsSemicolon()
+               || tmp->Is(CT_BRACE_OPEN)
+               || tmp->Is(CT_VBRACE_OPEN))
             {
                break;
             }
@@ -463,27 +459,27 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
          return;                  // c-sharp_10160
       }
 
-      if (  chunk_is_token(pc, CT_ALIGN)
+      if (  pc->Is(CT_ALIGN)
          && tmp != nullptr)
       {
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
+         if (tmp->Is(CT_BRACE_OPEN))
          {
-            set_paren_parent(tmp, pc->type);
+            set_paren_parent(tmp, pc->GetType());
             return;                  // d_40024
          }
-         else if (chunk_is_token(tmp, CT_COLON))
+         else if (tmp->Is(CT_COLON))
          {
-            set_chunk_parent(tmp, pc->type);
+            tmp->SetParentType(pc->GetType());
             return;                  // d_40024
          }
       }
    } // paren open + cast/align/delegate
 
-   if (chunk_is_token(pc, CT_INVARIANT))
+   if (pc->Is(CT_INVARIANT))
    {
-      if (chunk_is_token(next, CT_PAREN_OPEN))
+      if (next->Is(CT_PAREN_OPEN))
       {
-         set_chunk_parent(next, pc->type);
+         next->SetParentType(pc->GetType());
          Chunk *tmp = next->GetNext();
 
          if (tmp == nullptr)
@@ -493,9 +489,9 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
          while (tmp->IsNotNullChunk())
          {
-            if (chunk_is_token(tmp, CT_PAREN_CLOSE))
+            if (tmp->Is(CT_PAREN_CLOSE))
             {
-               set_chunk_parent(tmp, pc->type);
+               tmp->SetParentType(pc->GetType());
                break;
             }
             make_type(tmp);
@@ -505,21 +501,21 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       }
       else
       {
-         set_chunk_type(pc, CT_QUALIFIER);
+         pc->SetType(CT_QUALIFIER);
          return;
       }
    }
 
-   if (  chunk_is_token(prev, CT_BRACE_OPEN)
-      && get_chunk_parent_type(prev) != CT_CS_PROPERTY
-      && (  chunk_is_token(pc, CT_GETSET)
-         || chunk_is_token(pc, CT_GETSET_EMPTY)))
+   if (  prev->Is(CT_BRACE_OPEN)
+      && prev->GetParentType() != CT_CS_PROPERTY
+      && (  pc->Is(CT_GETSET)
+         || pc->Is(CT_GETSET_EMPTY)))
    {
       flag_parens(prev, PCF_NONE, CT_NONE, CT_GETSET, false);
       return;
    }
 
-   if (chunk_is_token(pc, CT_ASM))
+   if (pc->Is(CT_ASM))
    {
       flag_asm(pc);
       return;
@@ -528,10 +524,10 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    // clang stuff - A new derived type is introduced to C and, by extension, Objective-C, C++, and Objective-C++
    if (language_is_set(LANG_C | LANG_CPP | LANG_OC))
    {
-      if (chunk_is_token(pc, CT_CARET))
+      if (pc->Is(CT_CARET))
       {
-         if (  pc->flags.test(PCF_EXPR_START)
-            || pc->flags.test(PCF_IN_PREPROC))
+         if (  pc->TestFlags(PCF_EXPR_START)
+            || pc->TestFlags(PCF_IN_PREPROC))
          {
             handle_oc_block_literal(pc);
             return;
@@ -543,112 +539,121 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    if (language_is_set(LANG_OC))
    {
       // Check for message declarations
-      if (pc->flags.test(PCF_STMT_START))
+      if (pc->TestFlags(PCF_STMT_START))
       {
-         if (  (  chunk_is_str(pc, "-")
-               || chunk_is_str(pc, "+"))
-            && chunk_is_str(next, "("))
+         if (  (  pc->IsString("-")
+               || pc->IsString("+"))
+            && next->IsString("("))
          {
             handle_oc_message_decl(pc);
             return;
          }
       }
 
-      if (  pc->flags.test(PCF_EXPR_START)
-         || pc->flags.test(PCF_IN_PREPROC))
+      if (  pc->TestFlags(PCF_EXPR_START)
+         || pc->TestFlags(PCF_IN_PREPROC))
       {
-         if (chunk_is_token(pc, CT_SQUARE_OPEN))
+         if (pc->Is(CT_SQUARE_OPEN))
          {
             handle_oc_message_send(pc);
-            return;                  // objective-c_50003
+
+            // Only return early if the '[' was determined to be an OC MSG
+            // Otherwise, it could have been a lambda capture list (ie '[&]')
+            if (pc->GetParentType() == CT_OC_MSG)
+            {
+               return;  // objective-c_50003
+            }
          }
       }
 
-      if (chunk_is_token(pc, CT_OC_PROPERTY))
+      if (pc->Is(CT_OC_PROPERTY))
       {
          handle_oc_property_decl(pc);
          return;
       }
 
-      if (chunk_is_token(pc, CT_OC_AVAILABLE))
+      if (pc->Is(CT_OC_AVAILABLE))
       {
          handle_oc_available(pc);
          return;
       }
    }
 
-   // C# stuff
-   if (language_is_set(LANG_CS))
+   // C# and Vala stuff
+   if (language_is_set(LANG_CS | LANG_VALA))
    {
       // '[assembly: xxx]' stuff
-      if (  pc->flags.test(PCF_EXPR_START)
-         && chunk_is_token(pc, CT_SQUARE_OPEN))
+      if (  language_is_set(LANG_CS)
+         && pc->TestFlags(PCF_EXPR_START)
+         && pc->Is(CT_SQUARE_OPEN))
       {
          handle_cs_square_stmt(pc);
          return;
       }
 
-      if (  chunk_is_token(next, CT_BRACE_OPEN)
-         && get_chunk_parent_type(next) == CT_NONE
-         && (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-            || chunk_is_token(pc, CT_ANGLE_CLOSE)
-            || chunk_is_token(pc, CT_WORD)))
+      if (  language_is_set(LANG_CS)
+         && next->Is(CT_BRACE_OPEN)
+         && next->GetParentType() == CT_NONE
+         && (  pc->Is(CT_SQUARE_CLOSE)
+            || pc->Is(CT_ANGLE_CLOSE)
+            || pc->Is(CT_WORD)))
       {
          handle_cs_property(next);
          return;
       }
 
-      if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-         && chunk_is_token(next, CT_WORD))
+      if (  pc->Is(CT_SQUARE_CLOSE)
+         && next->Is(CT_WORD))
       {
          handle_cs_array_type(pc);
          return;
       }
 
-      if (  (  chunk_is_token(pc, CT_LAMBDA)
-            || chunk_is_token(pc, CT_DELEGATE))
-         && chunk_is_token(next, CT_BRACE_OPEN))
+      if (  (  pc->Is(CT_LAMBDA)
+            || pc->Is(CT_DELEGATE))
+         && next->Is(CT_BRACE_OPEN))
       {
-         set_paren_parent(next, pc->type);
+         set_paren_parent(next, pc->GetType());
          return;
       }
 
-      if (  chunk_is_token(pc, CT_WHEN)
+      if (  language_is_set(LANG_CS)
+         && pc->Is(CT_WHEN)
          && pc->GetNext()->IsNotNullChunk()
-         && pc->GetNext()->type != CT_SPAREN_OPEN)
+         && pc->GetNext()->IsNot(CT_SPAREN_OPEN))
       {
-         set_chunk_type(pc, CT_WORD);
+         pc->SetType(CT_WORD);
          return;
       }
    }
 
    if (  language_is_set(LANG_JAVA)
-      && chunk_is_token(pc, CT_LAMBDA)
-      && chunk_is_token(next, CT_BRACE_OPEN))
+      && pc->Is(CT_LAMBDA)
+      && next->Is(CT_BRACE_OPEN))
    {
-      set_paren_parent(next, pc->type);
+      set_paren_parent(next, pc->GetType());
       return;
    }
 
-   if (chunk_is_token(pc, CT_NEW))
+   if (pc->Is(CT_NEW))
    {
       Chunk *ts  = nullptr;
       Chunk *tmp = next;
 
-      if (chunk_is_token(tmp, CT_TSQUARE))
+      if (tmp->Is(CT_TSQUARE))
       {
          ts  = tmp;
          tmp = tmp->GetNextNcNnl();
       }
 
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         || chunk_is_token(tmp, CT_PAREN_OPEN))
+      if (  tmp->Is(CT_BRACE_OPEN)
+         || tmp->Is(CT_PAREN_OPEN))
       {
-         set_paren_parent(tmp, pc->type);
+         set_paren_parent(tmp, pc->GetType());
 
          if (ts != nullptr)
          {
-            set_chunk_parent(ts, pc->type);
+            ts->SetParentType(pc->GetType());
          }
       }
       return;
@@ -656,8 +661,8 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
    // C++11 Lambda stuff
    if (  language_is_set(LANG_CPP)
-      && (  chunk_is_token(pc, CT_SQUARE_OPEN)
-         || chunk_is_token(pc, CT_TSQUARE)))
+      && (  pc->Is(CT_SQUARE_OPEN)
+         || pc->Is(CT_TSQUARE)))
    {
       handle_cpp_lambda(pc);
    }
@@ -666,8 +671,8 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    // Issue #2432
    if (!language_is_set(LANG_OC))
    {
-      if (  chunk_is_token(pc, CT_ASSIGN)
-         && chunk_is_token(next, CT_SQUARE_OPEN))
+      if (  pc->Is(CT_ASSIGN)
+         && next->Is(CT_SQUARE_OPEN))
       {
          set_paren_parent(next, CT_ASSIGN);
 
@@ -676,16 +681,16 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
          while ((tmp = tmp->GetNextNc())->IsNotNullChunk())
          {
-            if (chunk_is_newline(tmp))
+            if (tmp->IsNewline())
             {
                break;
             }
 
-            if (  chunk_is_token(tmp, CT_SQUARE_CLOSE)
-               && next->level == tmp->level)
+            if (  tmp->Is(CT_SQUARE_CLOSE)
+               && next->GetLevel() == tmp->GetLevel())
             {
-               chunk_flags_set(tmp, PCF_ONE_LINER);
-               chunk_flags_set(next, PCF_ONE_LINER);
+               tmp->SetFlagBits(PCF_ONE_LINER);
+               next->SetFlagBits(PCF_ONE_LINER);
                break;
             }
          }
@@ -693,117 +698,138 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       }
    }
 
-   if (chunk_is_token(pc, CT_ASSERT))
+   if (pc->Is(CT_ASSERT))
    {
       handle_java_assert(pc);
       return;
    }
 
-   if (chunk_is_token(pc, CT_ANNOTATION))
+   if (pc->Is(CT_ANNOTATION))
    {
       Chunk *tmp = pc->GetNextNcNnl();
 
-      if (chunk_is_paren_open(tmp))
+      if (tmp->IsParenOpen())
       {
          set_paren_parent(tmp, CT_ANNOTATION);
       }
       return;
    }
 
-   if (  chunk_is_token(pc, CT_SIZEOF)
+   if (  pc->Is(CT_SIZEOF)
       && language_is_set(LANG_ALLC))
    {
       Chunk *tmp = pc->GetNextNcNnl();
 
-      if (chunk_is_token(tmp, CT_ELLIPSIS))
+      if (tmp->Is(CT_ELLIPSIS))
       {
-         set_chunk_parent(tmp, CT_SIZEOF);
+         tmp->SetParentType(CT_SIZEOF);
       }
       return;
    }
 
-   if (  chunk_is_token(pc, CT_DECLTYPE)
-      && pc->parent_type != CT_FUNC_DEF)
+   if (  pc->Is(CT_DECLTYPE)
+      && pc->GetParentType() != CT_FUNC_DEF)
    {
       Chunk *tmp = pc->GetNextNcNnl();
 
-      if (chunk_is_paren_open(tmp))
+      if (tmp->IsParenOpen())
       {
          // decltype may be followed by a braced-init-list
          tmp = set_paren_parent(tmp, CT_DECLTYPE);
 
-         if (chunk_is_opening_brace(tmp) && !pc->flags.test(PCF_IN_LAMBDA))
+         if (tmp->IsBraceOpen() && !pc->TestFlags(PCF_IN_LAMBDA))
          {
             tmp = set_paren_parent(tmp, CT_BRACED_INIT_LIST);
 
-            if (tmp)
+            if (  tmp != nullptr
+               && tmp->IsNotNullChunk())
             {
-               chunk_flags_clr(tmp, PCF_EXPR_START | PCF_STMT_START);
+               tmp->ResetFlagBits(PCF_EXPR_START | PCF_STMT_START);
             }
          }
          else
          {
-            if (chunk_is_token(tmp, CT_WORD))
+            if (  tmp != nullptr
+               && tmp->Is(CT_WORD))
             {
-               chunk_flags_set(tmp, PCF_VAR_1ST_DEF);
+               tmp->SetFlagBits(PCF_VAR_1ST_DEF);
             }
          }
       }
       return;
    }
 
-   // A [] in C# and D only follows a type
-   if (  chunk_is_token(pc, CT_TSQUARE)
+   // A [] in C#, D and Vala only follows a type
+   if (  pc->Is(CT_TSQUARE)
       && language_is_set(LANG_D | LANG_CS | LANG_VALA))
    {
-      if (chunk_is_token(prev, CT_WORD))
+      if (prev->Is(CT_WORD))
       {
-         set_chunk_type(prev, CT_TYPE);
+         prev->SetType(CT_TYPE);
       }
 
-      if (chunk_is_token(next, CT_WORD))
+      if (next->Is(CT_WORD))
       {
-         chunk_flags_set(next, PCF_VAR_1ST_DEF);
+         next->SetFlagBits(PCF_VAR_1ST_DEF);
       }
       return;
    }
 
-   if (  chunk_is_token(pc, CT_SQL_EXEC)
-      || chunk_is_token(pc, CT_SQL_BEGIN)
-      || chunk_is_token(pc, CT_SQL_END))
+   if (  pc->Is(CT_SQL_EXEC)
+      || pc->Is(CT_SQL_BEGIN)
+      || pc->Is(CT_SQL_END))
    {
       mark_exec_sql(pc);
       return;
    }
 
-   if (chunk_is_token(pc, CT_PROTO_WRAP))
+   if (pc->Is(CT_PROTO_WRAP))
    {
       handle_proto_wrap(pc);
       return;
    }
 
    // Handle the typedef
-   if (chunk_is_token(pc, CT_TYPEDEF))
+   if (pc->Is(CT_TYPEDEF))
    {
       fix_typedef(pc);
       return;
    }
 
-   if (  chunk_is_class_enum_struct_union(pc)
-      && chunk_is_not_token(prev, CT_TYPEDEF))
+   if (  pc->IsClassEnumStructOrUnion()
+      && prev->IsNot(CT_TYPEDEF))
    {
+      // Issue #3811
+      // Sometimes the enum chunk can exist in a parameter (ie. `void foo(enum EnumType param)`)
+      // In this case we don't need to run the parser since we are not declaring an enum.
+      if (pc->IsEnum())
+      {
+         const size_t level = pc->GetLevel();
+         Chunk        *tmp  = pc;
+
+         while (tmp->GetLevel() == level && tmp->IsNotNullChunk())
+         {
+            tmp = tmp->GetNextNcNnl();
+         }
+
+         if (tmp->GetLevel() < level)
+         {
+            return;
+         }
+      }
       EnumStructUnionParser parser;
       parser.parse(pc);
       return;
    }
 
-   if (chunk_is_token(pc, CT_EXTERN))
+   if (pc->Is(CT_EXTERN))
    {
-      if (chunk_is_paren_open(next))
+      if (next->IsParenOpen())
       {
          Chunk *tmp = flag_parens(next, PCF_NONE, CT_NONE, CT_EXTERN, true);
 
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
+         if (  tmp != nullptr
+            && tmp->Is(CT_BRACE_OPEN))
          {
             set_paren_parent(tmp, CT_EXTERN);
          }
@@ -811,10 +837,10 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       else
       {
          // next likely is a string (see tokenize_cleanup.cpp)
-         set_chunk_parent(next, CT_EXTERN);
+         next->SetParentType(CT_EXTERN);
          Chunk *tmp = next->GetNextNcNnl();
 
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
+         if (tmp->Is(CT_BRACE_OPEN))
          {
             set_paren_parent(tmp, CT_EXTERN);
          }
@@ -822,7 +848,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       return;
    }
 
-   if (chunk_is_token(pc, CT_TEMPLATE))
+   if (pc->Is(CT_TEMPLATE))
    {
       if (language_is_set(LANG_D))
       {
@@ -835,39 +861,39 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       return;
    }
 
-   if (  chunk_is_token(pc, CT_WORD)
-      && chunk_is_token(next, CT_ANGLE_OPEN)
-      && get_chunk_parent_type(next) == CT_TEMPLATE)
+   if (  pc->Is(CT_WORD)
+      && next->Is(CT_ANGLE_OPEN)
+      && next->GetParentType() == CT_TEMPLATE)
    {
       mark_template_func(pc, next);
       return;
    }
 
-   if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-      && chunk_is_token(next, CT_PAREN_OPEN))
+   if (  pc->Is(CT_SQUARE_CLOSE)
+      && next->Is(CT_PAREN_OPEN))
    {
       flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, CT_NONE, false);
       return;
    }
 
-   if (chunk_is_token(pc, CT_TYPE_CAST))
+   if (pc->Is(CT_TYPE_CAST))
    {
       fix_type_cast(pc);
       return;
    }
 
-   if (  get_chunk_parent_type(pc) == CT_ASSIGN
-      && (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_SQUARE_OPEN)))
+   if (  pc->GetParentType() == CT_ASSIGN
+      && (  pc->Is(CT_BRACE_OPEN)
+         || pc->Is(CT_SQUARE_OPEN)))
    {
       // Mark everything in here as in assign
-      flag_parens(pc, PCF_IN_ARRAY_ASSIGN, pc->type, CT_NONE, false);
+      flag_parens(pc, PCF_IN_ARRAY_ASSIGN, pc->GetType(), CT_NONE, false);
       return;
    }
 
-   if (chunk_is_token(pc, CT_D_TEMPLATE))
+   if (pc->Is(CT_D_TEMPLATE))
    {
-      set_paren_parent(next, pc->type);
+      set_paren_parent(next, pc->GetType());
       return;
    }
 
@@ -875,36 +901,36 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
     * A word before an open paren is a function call or definition.
     * CT_WORD => CT_FUNC_CALL or CT_FUNC_DEF
     */
-   if (chunk_is_token(next, CT_PAREN_OPEN))
+   if (next->Is(CT_PAREN_OPEN))
    {
       Chunk *tmp = next->GetNextNcNnl();
 
       if (  language_is_set(LANG_C | LANG_CPP | LANG_OC)
-         && chunk_is_token(tmp, CT_CARET))
+         && tmp->Is(CT_CARET))
       {
          handle_oc_block_type(tmp);
 
          // This is the case where a block literal is passed as the first argument of a C-style method invocation.
-         if (  (  chunk_is_token(tmp, CT_OC_BLOCK_CARET)
-               || chunk_is_token(tmp, CT_CARET))
-            && chunk_is_token(pc, CT_WORD))
+         if (  (  tmp->Is(CT_OC_BLOCK_CARET)
+               || tmp->Is(CT_CARET))
+            && pc->Is(CT_WORD))
          {
-            LOG_FMT(LFCN, "%s(%d): (1) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-            set_chunk_type(pc, CT_FUNC_CALL);
+            LOG_FMT(LFCN, "%s(%d): (1) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+            pc->SetType(CT_FUNC_CALL);
          }
       }
-      else if (  chunk_is_token(pc, CT_WORD)
-              || chunk_is_token(pc, CT_OPERATOR_VAL))
+      else if (  pc->Is(CT_WORD)
+              || pc->Is(CT_OPERATOR_VAL))
       {
-         set_chunk_type(pc, CT_FUNCTION);
+         pc->SetType(CT_FUNCTION);
       }
-      else if (chunk_is_token(pc, CT_FIXED))
+      else if (pc->Is(CT_FIXED))
       {
-         set_chunk_type(pc, CT_FUNCTION);
-         set_chunk_parent(pc, CT_FIXED);
+         pc->SetType(CT_FUNCTION);
+         pc->SetParentType(CT_FIXED);
       }
-      else if (chunk_is_token(pc, CT_TYPE))
+      else if (pc->Is(CT_TYPE))
       {
          /*
           * If we are on a type, then we are either on a C++ style cast, an
@@ -917,8 +943,8 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
           *
           * FIXME: this check can be done better...
           */
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+         LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
 
          bool is_byref_array = false;
 
@@ -929,23 +955,23 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
             // array being passed by reference, not a cast
             tmp = next->GetNextNcNnl();
 
-            if (chunk_is_token(tmp, CT_AMP))
+            if (tmp->Is(CT_AMP))
             {
                auto tmp2 = tmp->GetNextNcNnl();
 
-               if (chunk_is_token(tmp2, CT_WORD))
+               if (tmp2->Is(CT_WORD))
                {
                   tmp2 = tmp2->GetNextNcNnl();
                }
 
-               if (chunk_is_token(tmp2, CT_PAREN_CLOSE))
+               if (tmp2->Is(CT_PAREN_CLOSE))
                {
                   tmp2 = tmp2->GetNextNcNnl();
 
-                  if (chunk_is_token(tmp2, CT_SQUARE_OPEN))
+                  if (tmp2->Is(CT_SQUARE_OPEN))
                   {
                      is_byref_array = true;
-                     set_chunk_type(tmp, CT_BYREF);
+                     tmp->SetType(CT_BYREF);
                   }
                }
             }
@@ -953,32 +979,32 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
          if (!is_byref_array)
          {
-            tmp = next->GetNextType(CT_PAREN_CLOSE, next->level);
+            tmp = next->GetNextType(CT_PAREN_CLOSE, next->GetLevel());
 
             if (tmp->IsNotNullChunk())
             {
                tmp = tmp->GetNext();
 
-               if (chunk_is_token(tmp, CT_PAREN_OPEN))
+               if (tmp->Is(CT_PAREN_OPEN))
                {
-                  set_chunk_type(pc, CT_FUNCTION);
+                  pc->SetType(CT_FUNCTION);
                }
                else
                {
-                  if (  get_chunk_parent_type(pc) == CT_NONE
-                     && !pc->flags.test(PCF_IN_TYPEDEF))
+                  if (  pc->GetParentType() == CT_NONE
+                     && !pc->TestFlags(PCF_IN_TYPEDEF))
                   {
                      tmp = next->GetNextNcNnl();
 
-                     if (chunk_is_token(tmp, CT_PAREN_CLOSE))
+                     if (tmp->Is(CT_PAREN_CLOSE))
                      {
                         // we have TYPE()
-                        set_chunk_type(pc, CT_FUNCTION);
+                        pc->SetType(CT_FUNCTION);
                      }
                      else
                      {
                         // we have TYPE(...)
-                        set_chunk_type(pc, CT_CPP_CAST);
+                        pc->SetType(CT_CPP_CAST);
                         set_paren_parent(next, CT_CPP_CAST);
                      }
                   }
@@ -990,25 +1016,25 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
    if (language_is_set(LANG_PAWN))
    {
-      if (  chunk_is_token(pc, CT_FUNCTION)
-         && pc->brace_level > 0)
+      if (  pc->Is(CT_FUNCTION)
+         && pc->GetBraceLevel() > 0)
       {
-         LOG_FMT(LFCN, "%s(%d): (2) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-         set_chunk_type(pc, CT_FUNC_CALL);
+         LOG_FMT(LFCN, "%s(%d): (2) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+         pc->SetType(CT_FUNC_CALL);
       }
 
-      if (  chunk_is_token(pc, CT_STATE)
-         && chunk_is_token(next, CT_PAREN_OPEN))
+      if (  pc->Is(CT_STATE)
+         && next->Is(CT_PAREN_OPEN))
       {
-         set_paren_parent(next, pc->type);
+         set_paren_parent(next, pc->GetType());
       }
    }
    else
    {
-      if (  (  chunk_is_token(pc, CT_FUNCTION)
-            || chunk_is_token(pc, CT_FUNC_DEF))
-         && (  (get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR)
+      if (  (  pc->Is(CT_FUNCTION)
+            || pc->Is(CT_FUNC_DEF))
+         && (  (pc->GetParentType() == CT_OC_BLOCK_EXPR)
             || !is_oc_block(pc)))
       {
          mark_function(pc);
@@ -1016,29 +1042,29 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    }
 
    // Detect C99 member stuff
-   if (  chunk_is_token(pc, CT_MEMBER)
-      && (  chunk_is_token(prev, CT_COMMA)
-         || chunk_is_token(prev, CT_BRACE_OPEN)))
+   if (  pc->Is(CT_MEMBER)
+      && (  prev->Is(CT_COMMA)
+         || prev->Is(CT_BRACE_OPEN)))
    {
-      set_chunk_type(pc, CT_C99_MEMBER);
-      set_chunk_parent(next, CT_C99_MEMBER);
+      pc->SetType(CT_C99_MEMBER);
+      next->SetParentType(CT_C99_MEMBER);
       return;
    }
 
    // Mark function parens and braces
-   if (  chunk_is_token(pc, CT_FUNC_DEF)
-      || chunk_is_token(pc, CT_FUNC_CALL)
-      || chunk_is_token(pc, CT_FUNC_CALL_USER)
-      || chunk_is_token(pc, CT_FUNC_PROTO))
+   if (  pc->Is(CT_FUNC_DEF)
+      || pc->Is(CT_FUNC_CALL)
+      || pc->Is(CT_FUNC_CALL_USER)
+      || pc->Is(CT_FUNC_PROTO))
    {
       Chunk *tmp = next;
 
-      if (chunk_is_token(tmp, CT_SQUARE_OPEN))
+      if (tmp->Is(CT_SQUARE_OPEN))
       {
-         tmp = set_paren_parent(tmp, pc->type);
+         tmp = set_paren_parent(tmp, pc->GetType());
       }
-      else if (  chunk_is_token(tmp, CT_TSQUARE)
-              || get_chunk_parent_type(tmp) == CT_OPERATOR)
+      else if (  tmp->Is(CT_TSQUARE)
+              || tmp->GetParentType() == CT_OPERATOR)
       {
          tmp = tmp->GetNextNcNnl();
       }
@@ -1046,25 +1072,25 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       if (  tmp != nullptr
          && tmp->IsNotNullChunk())
       {
-         if (chunk_is_paren_open(tmp))
+         if (tmp->IsParenOpen())
          {
-            tmp = flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, pc->type, false);
+            tmp = flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, pc->GetType(), false);
 
             if (  tmp != nullptr
                && tmp->IsNotNullChunk())
             {
-               if (chunk_is_token(tmp, CT_BRACE_OPEN))
+               if (tmp->Is(CT_BRACE_OPEN))
                {
-                  if (  get_chunk_parent_type(tmp) != CT_DOUBLE_BRACE
-                     && !pc->flags.test(PCF_IN_CONST_ARGS))
+                  if (  tmp->GetParentType() != CT_DOUBLE_BRACE
+                     && !pc->TestFlags(PCF_IN_CONST_ARGS))
                   {
-                     set_paren_parent(tmp, pc->type);
+                     set_paren_parent(tmp, pc->GetType());
                   }
                }
-               else if (  chunk_is_semicolon(tmp)
-                       && chunk_is_token(pc, CT_FUNC_PROTO))
+               else if (  tmp->IsSemicolon()
+                       && pc->Is(CT_FUNC_PROTO))
                {
-                  set_chunk_parent(tmp, pc->type);
+                  tmp->SetParentType(pc->GetType());
                }
             }
          }
@@ -1073,19 +1099,19 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    }
 
    // Mark the parameters in catch()
-   if (  chunk_is_token(pc, CT_CATCH)
-      && chunk_is_token(next, CT_SPAREN_OPEN))
+   if (  pc->Is(CT_CATCH)
+      && next->Is(CT_SPAREN_OPEN))
    {
       fix_fcn_def_params(next);
       return;
    }
 
-   if (  chunk_is_token(pc, CT_THROW)
-      && chunk_is_token(prev, CT_FPAREN_CLOSE))
+   if (  pc->Is(CT_THROW)
+      && prev->Is(CT_FPAREN_CLOSE))
    {
-      set_chunk_parent(pc, get_chunk_parent_type(prev));
+      pc->SetParentType(prev->GetParentType());
 
-      if (chunk_is_token(next, CT_PAREN_OPEN))
+      if (next->Is(CT_PAREN_OPEN))
       {
          set_paren_parent(next, CT_THROW);
       }
@@ -1093,15 +1119,15 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    }
 
    // Mark the braces in: "for_each_entry(xxx) { }"
-   if (  chunk_is_token(pc, CT_BRACE_OPEN)
-      && get_chunk_parent_type(pc) != CT_DOUBLE_BRACE
-      && chunk_is_token(prev, CT_FPAREN_CLOSE)
-      && (  get_chunk_parent_type(prev) == CT_FUNC_CALL
-         || get_chunk_parent_type(prev) == CT_FUNC_CALL_USER)
-      && !pc->flags.test(PCF_IN_CONST_ARGS))
-   {
-      LOG_FMT(LFCN, "%s(%d): (3) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+   if (  pc->Is(CT_BRACE_OPEN)
+      && pc->GetParentType() != CT_DOUBLE_BRACE
+      && prev->Is(CT_FPAREN_CLOSE)
+      && (  prev->GetParentType() == CT_FUNC_CALL
+         || prev->GetParentType() == CT_FUNC_CALL_USER)
+      && !pc->TestFlags(PCF_IN_CONST_ARGS))
+   {
+      LOG_FMT(LFCN, "%s(%d): (3) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
       set_paren_parent(pc, CT_FUNC_CALL);
       return;
    }
@@ -1111,15 +1137,15 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
     * which means that we are on a function type declaration (C/C++ only?).
     * Note that typedefs are already taken care of.
     */
-   if (  !pc->flags.test(PCF_IN_TEMPLATE)                         // Issue #3252
-      && get_chunk_parent_type(pc) != CT_CPP_CAST
-      && get_chunk_parent_type(pc) != CT_C_CAST
-      && !pc->flags.test(PCF_IN_PREPROC)
+   if (  !pc->TestFlags(PCF_IN_TEMPLATE)                         // Issue #3252
+      && pc->GetParentType() != CT_CPP_CAST
+      && pc->GetParentType() != CT_C_CAST
+      && !pc->TestFlags(PCF_IN_PREPROC)
       && !is_oc_block(pc)
-      && get_chunk_parent_type(pc) != CT_OC_MSG_DECL
-      && get_chunk_parent_type(pc) != CT_OC_MSG_SPEC
-      && chunk_is_str(pc, ")")
-      && chunk_is_str(next, "("))
+      && pc->GetParentType() != CT_OC_MSG_DECL
+      && pc->GetParentType() != CT_OC_MSG_SPEC
+      && pc->IsString(")")
+      && next->IsString("("))
    {
       if (language_is_set(LANG_D))
       {
@@ -1132,7 +1158,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       return;
    }
 
-   if (chunk_is_token(pc, CT_OC_CLASS))
+   if (pc->Is(CT_OC_CLASS))
    {
       handle_oc_class(pc);
       return;
@@ -1145,24 +1171,24 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
        * Check a parenthesis pair to see if it is a cast.
        * Note that SPAREN and FPAREN have already been marked.
        */
-      if (  chunk_is_token(pc, CT_PAREN_OPEN)
-         && (  get_chunk_parent_type(pc) == CT_NONE
-            || get_chunk_parent_type(pc) == CT_OC_MSG
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR
-            || get_chunk_parent_type(pc) == CT_CS_SQ_STMT)           // Issue # 1256
-         && (  chunk_is_token(next, CT_WORD)
-            || chunk_is_token(next, CT_TYPE)
-            || chunk_is_token(next, CT_STRUCT)
-            || chunk_is_token(next, CT_QUALIFIER)
-            || chunk_is_token(next, CT_MEMBER)
-            || chunk_is_token(next, CT_DC_MEMBER)
-            || chunk_is_token(next, CT_ENUM)
-            || chunk_is_token(next, CT_UNION))
-         && chunk_is_not_token(prev, CT_DECLTYPE)
-         && chunk_is_not_token(prev, CT_SIZEOF)
-         && get_chunk_parent_type(prev) != CT_SIZEOF
-         && get_chunk_parent_type(prev) != CT_OPERATOR
-         && !pc->flags.test(PCF_IN_TYPEDEF))
+      if (  pc->Is(CT_PAREN_OPEN)
+         && (  pc->GetParentType() == CT_NONE
+            || pc->GetParentType() == CT_OC_MSG
+            || pc->GetParentType() == CT_OC_BLOCK_EXPR
+            || pc->GetParentType() == CT_CS_SQ_STMT)           // Issue # 1256
+         && (  next->Is(CT_WORD)
+            || next->Is(CT_TYPE)
+            || next->Is(CT_STRUCT)
+            || next->Is(CT_QUALIFIER)
+            || next->Is(CT_MEMBER)
+            || next->Is(CT_DC_MEMBER)
+            || next->Is(CT_ENUM)
+            || next->Is(CT_UNION))
+         && prev->IsNot(CT_DECLTYPE)
+         && prev->IsNot(CT_SIZEOF)
+         && prev->GetParentType() != CT_SIZEOF
+         && prev->GetParentType() != CT_OPERATOR
+         && !pc->TestFlags(PCF_IN_TYPEDEF))
       {
          fix_casts(pc);
          return;
@@ -1174,33 +1200,33 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       Chunk *nnext = next->GetNextNcNnl();
 
       // handle parent_type of assigns in special functions (ro5 + pure virtual)
-      if (  pc->flags.test_any(PCF_IN_STRUCT | PCF_IN_CLASS)
-         && chunk_is_token(pc, CT_ASSIGN)
-         && chunk_is_token(nnext, CT_SEMICOLON)
-         && (  chunk_is_token(next, CT_DEFAULT)
-            || chunk_is_token(next, CT_DELETE)
-            || (  chunk_is_token(next, CT_NUMBER)
-               && chunk_is_str(next, "0"))))
-      {
-         const size_t level        = pc->level;
+      if (  pc->GetFlags().test_any(PCF_IN_STRUCT | PCF_IN_CLASS)
+         && pc->Is(CT_ASSIGN)
+         && nnext->Is(CT_SEMICOLON)
+         && (  next->Is(CT_DEFAULT)
+            || next->Is(CT_DELETE)
+            || (  next->Is(CT_NUMBER)
+               && next->IsString("0"))))
+      {
+         const size_t level        = pc->GetLevel();
          bool         found_status = false;
          Chunk        *pprev       = pc->GetPrev();
 
          for ( ; (  pprev->IsNotNullChunk()
-                 && pprev->level >= level
-                 && chunk_is_not_token(pprev, CT_SEMICOLON)
-                 && chunk_is_not_token(pprev, CT_ACCESS_COLON))
+                 && pprev->GetLevel() >= level
+                 && pprev->IsNot(CT_SEMICOLON)
+                 && pprev->IsNot(CT_ACCESS_COLON))
                ; pprev = pprev->GetPrev())
          {
-            if (pprev->level != level)
+            if (pprev->GetLevel() != level)
             {
                continue;
             }
 
-            if (chunk_is_token(next, CT_NUMBER))
+            if (next->Is(CT_NUMBER))
             {
-               if (  chunk_is_token(pprev, CT_QUALIFIER)
-                  && chunk_is_str(pprev, "virtual"))
+               if (  pprev->Is(CT_QUALIFIER)
+                  && pprev->IsString("virtual"))
                {
                   found_status = true;
                   break;
@@ -1208,8 +1234,8 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
             }
             else
             {
-               if (  chunk_is_token(pprev, CT_FUNC_CLASS_PROTO)  // ctor/dtor
-                  || chunk_is_token(pprev, CT_FUNC_PROTO))       // normal function
+               if (  pprev->Is(CT_FUNC_CLASS_PROTO)  // ctor/dtor
+                  || pprev->Is(CT_FUNC_PROTO))       // normal function
                {
                   found_status = true;
                   break;
@@ -1219,7 +1245,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
          if (found_status)
          {
-            set_chunk_parent(pc, pprev->type);
+            pc->SetParentType(pprev->GetType());
          }
       }
 
@@ -1230,72 +1256,72 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    }
 
    // Check for stuff that can only occur at the start of an expression
-   if (  pc->flags.test(PCF_EXPR_START)
-      || (  prev->flags.test(PCF_EXPR_START)
-         && get_chunk_parent_type(pc) == CT_OC_AT))
+   if (  pc->TestFlags(PCF_EXPR_START)
+      || (  prev->TestFlags(PCF_EXPR_START)
+         && pc->GetParentType() == CT_OC_AT))
    {
       // Change STAR, MINUS, and PLUS in the easy cases
-      if (chunk_is_token(pc, CT_STAR))
+      if (pc->Is(CT_STAR))
       {
          // issue #596
          // [0x100062020:IN_SPAREN,IN_FOR,STMT_START,EXPR_START,PUNCTUATOR]
-         // prev->type is CT_COLON ==> CT_DEREF
-         if (chunk_is_token(prev, CT_ANGLE_CLOSE))
+         // prev->GetType() is CT_COLON ==> CT_DEREF
+         if (prev->Is(CT_ANGLE_CLOSE))
          {
-            set_chunk_type(pc, CT_PTR_TYPE);
+            pc->SetType(CT_PTR_TYPE);
          }
-         else if (chunk_is_token(prev, CT_COLON))
+         else if (prev->Is(CT_COLON))
          {
-            set_chunk_type(pc, CT_DEREF);
+            pc->SetType(CT_DEREF);
          }
          else
          {
-            set_chunk_type(pc, CT_DEREF);
+            pc->SetType(CT_DEREF);
          }
       }
 
       if (  language_is_set(LANG_CPP)
-         && chunk_is_token(pc, CT_CARET)
-         && chunk_is_token(prev, CT_ANGLE_CLOSE))
+         && pc->Is(CT_CARET)
+         && prev->Is(CT_ANGLE_CLOSE))
       {
-         set_chunk_type(pc, CT_PTR_TYPE);
+         pc->SetType(CT_PTR_TYPE);
       }
 
       if (  language_is_set(LANG_CS | LANG_VALA)
-         && chunk_is_token(pc, CT_QUESTION)
-         && chunk_is_token(prev, CT_ANGLE_CLOSE))
+         && pc->Is(CT_QUESTION)
+         && prev->Is(CT_ANGLE_CLOSE))
       {
-         set_chunk_type(pc, CT_PTR_TYPE);
+         pc->SetType(CT_PTR_TYPE);
       }
 
-      else if (chunk_is_token(pc, CT_MINUS))
+      else if (pc->Is(CT_MINUS))
       {
-         set_chunk_type(pc, CT_NEG);
+         pc->SetType(CT_NEG);
       }
 
-      else if (chunk_is_token(pc, CT_PLUS))
+      else if (pc->Is(CT_PLUS))
       {
-         set_chunk_type(pc, CT_POS);
+         pc->SetType(CT_POS);
       }
 
-      else if (chunk_is_token(pc, CT_INCDEC_AFTER))
+      else if (pc->Is(CT_INCDEC_AFTER))
       {
-         set_chunk_type(pc, CT_INCDEC_BEFORE);
+         pc->SetType(CT_INCDEC_BEFORE);
       }
 
-      else if (chunk_is_token(pc, CT_AMP))
+      else if (pc->Is(CT_AMP))
       {
-         if (chunk_is_token(prev, CT_ANGLE_CLOSE))             // Issue #2324
+         if (prev->Is(CT_ANGLE_CLOSE))             // Issue #2324
          {
-            set_chunk_type(pc, CT_BYREF);
+            pc->SetType(CT_BYREF);
          }
          else
          {
-            set_chunk_type(pc, CT_ADDR);
+            pc->SetType(CT_ADDR);
          }
       }
 
-      else if (chunk_is_token(pc, CT_CARET))
+      else if (pc->Is(CT_CARET))
       {
          if (language_is_set(LANG_C | LANG_CPP | LANG_OC))
          {
@@ -1309,86 +1335,86 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
     * Change the parenthesis pair after a function/macro-function
     * CT_PAREN_OPEN => CT_FPAREN_OPEN
     */
-   if (chunk_is_token(pc, CT_MACRO_FUNC))
+   if (pc->Is(CT_MACRO_FUNC))
    {
       flag_parens(next, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_MACRO_FUNC, false);
    }
 
-   if (  chunk_is_token(pc, CT_MACRO_OPEN)
-      || chunk_is_token(pc, CT_MACRO_ELSE)
-      || chunk_is_token(pc, CT_MACRO_CLOSE))
+   if (  pc->Is(CT_MACRO_OPEN)
+      || pc->Is(CT_MACRO_ELSE)
+      || pc->Is(CT_MACRO_CLOSE))
    {
-      if (chunk_is_token(next, CT_PAREN_OPEN))
+      if (next->Is(CT_PAREN_OPEN))
       {
-         flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, pc->type, false);
+         flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, pc->GetType(), false);
       }
    }
 
-   if (  chunk_is_token(pc, CT_DELETE)
-      && chunk_is_token(next, CT_TSQUARE))
+   if (  pc->Is(CT_DELETE)
+      && next->Is(CT_TSQUARE))
    {
-      set_chunk_parent(next, CT_DELETE);
+      next->SetParentType(CT_DELETE);
    }
 
    // Change CT_STAR to CT_PTR_TYPE or CT_ARITH or CT_DEREF
-   if (  chunk_is_token(pc, CT_STAR)
+   if (  pc->Is(CT_STAR)
       || (  language_is_set(LANG_CPP)
-         && chunk_is_token(pc, CT_CARET)))
+         && pc->Is(CT_CARET)))
    {
-      if (  chunk_is_paren_close(next)
-         || chunk_is_token(next, CT_COMMA))
+      if (  next->IsParenClose()
+         || next->Is(CT_COMMA))
       {
-         set_chunk_type(pc, CT_PTR_TYPE);
+         pc->SetType(CT_PTR_TYPE);
       }
       else if (  language_is_set(LANG_OC)
-              && chunk_is_token(next, CT_STAR))
+              && next->Is(CT_STAR))
       {
          /*
           * Change pointer-to-pointer types in OC_MSG_DECLs
           * from ARITH <===> DEREF to PTR_TYPE <===> PTR_TYPE
           */
-         set_chunk_type(pc, CT_PTR_TYPE);
-         set_chunk_parent(pc, get_chunk_parent_type(prev));
+         pc->SetType(CT_PTR_TYPE);
+         pc->SetParentType(prev->GetParentType());
 
-         set_chunk_type(next, CT_PTR_TYPE);
-         set_chunk_parent(next, get_chunk_parent_type(pc));
+         next->SetType(CT_PTR_TYPE);
+         next->SetParentType(pc->GetParentType());
       }
-      else if (  chunk_is_token(pc, CT_STAR)
-              && (  chunk_is_token(prev, CT_DECLTYPE)
-                 || chunk_is_token(prev, CT_SIZEOF)
-                 || chunk_is_token(prev, CT_DELETE)
-                 || get_chunk_parent_type(pc) == CT_SIZEOF))
+      else if (  pc->Is(CT_STAR)
+              && (  prev->Is(CT_DECLTYPE)
+                 || prev->Is(CT_SIZEOF)
+                 || prev->Is(CT_DELETE)
+                 || pc->GetParentType() == CT_SIZEOF))
       {
-         set_chunk_type(pc, CT_DEREF);
+         pc->SetType(CT_DEREF);
       }
-      else if (  (  chunk_is_token(prev, CT_WORD)
+      else if (  (  prev->Is(CT_WORD)
                  && chunk_ends_type(prev)
-                 && !prev->flags.test(PCF_IN_FCN_CTOR)
-                 && !prev->flags.test(PCF_IN_ARRAY_ASSIGN)) // Issue #3345
-              || chunk_is_token(prev, CT_DC_MEMBER)
-              || chunk_is_token(prev, CT_PTR_TYPE))
+                 && !prev->TestFlags(PCF_IN_FCN_CTOR)
+                 && !prev->TestFlags(PCF_IN_ARRAY_ASSIGN)) // Issue #3345
+              || prev->Is(CT_DC_MEMBER)
+              || prev->Is(CT_PTR_TYPE))
       {
-         LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n   ",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
-         log_pcf_flags(LFCNR, pc->flags);
-         set_chunk_type(pc, CT_PTR_TYPE);
+         LOG_FMT(LFCNR, "%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()));
+         log_pcf_flags(LFCNR, pc->GetFlags());
+         pc->SetType(CT_PTR_TYPE);
       }
-      else if (  chunk_is_token(next, CT_SQUARE_OPEN)
+      else if (  next->Is(CT_SQUARE_OPEN)
               && !language_is_set(LANG_OC))  // Issue #408
       {
-         set_chunk_type(pc, CT_PTR_TYPE);
+         pc->SetType(CT_PTR_TYPE);
       }
-      else if (chunk_is_token(pc, CT_STAR))
+      else if (pc->Is(CT_STAR))
       {
          // Add check for CT_DC_MEMBER CT_WORD CT_STAR sequence
          // to convert CT_WORD into CT_TYPE
          // and CT_STAR into CT_PTR_TYPE
-         // look for an assign backward, fuction call, return to distinguish between
+         // look for an assign backward, function call, return to distinguish between
          //    double result = Constants::PI * factor;
          // and
          //    ::some::name * foo;
-         if (  chunk_is_token(prev, CT_WORD)
-            && chunk_is_token(prev->prev, CT_DC_MEMBER)
+         if (  prev->Is(CT_WORD)
+            && prev->GetPrev()->Is(CT_DC_MEMBER)
             && language_is_set(LANG_CPP))
          {
             // Issue 1402
@@ -1397,14 +1423,14 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
             while (tmp->IsNotNullChunk())
             {
-               if (  chunk_is_token(tmp, CT_SEMICOLON)
-                  || get_chunk_parent_type(tmp) == CT_CLASS)
+               if (  tmp->Is(CT_SEMICOLON)
+                  || tmp->GetParentType() == CT_CLASS)
                {
                   break;
                }
-               else if (  chunk_is_token(tmp, CT_ASSIGN)
-                       || chunk_is_token(tmp, CT_FUNC_CALL)
-                       || chunk_is_token(tmp, CT_RETURN))
+               else if (  tmp->Is(CT_ASSIGN)
+                       || tmp->Is(CT_FUNC_CALL)
+                       || tmp->Is(CT_RETURN))
                {
                   is_multiplication = true;
                   break;
@@ -1415,13 +1441,13 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
             if (is_multiplication)
             {
                // double result = Constants::PI * factor;
-               set_chunk_type(pc, CT_ARITH);
+               pc->SetType(CT_ARITH);
             }
             else
             {
                //    ::some::name * foo;
-               set_chunk_type(prev, CT_TYPE);
-               set_chunk_type(pc, CT_PTR_TYPE);
+               prev->SetType(CT_TYPE);
+               pc->SetType(CT_PTR_TYPE);
             }
          }
 
@@ -1434,69 +1460,75 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
           * most PCF_PUNCTUATOR chunks except a paren close would make this
           * a deref. A paren close may end a cast or may be part of a macro fcn.
           */
-         if (chunk_is_token(prev, CT_TYPE))
+         if (prev->Is(CT_TYPE))
          {
-            set_chunk_type(pc, CT_PTR_TYPE);
+            pc->SetType(CT_PTR_TYPE);
          }
-         else if (  chunk_is_token(pc->next, CT_SEMICOLON)      // Issue #2319
-                 || (  chunk_is_token(pc->next, CT_STAR)
-                    && chunk_is_token(pc->next->next, CT_SEMICOLON)))
+         else if (  pc->GetNext()->Is(CT_SEMICOLON)      // Issue #2319
+                 || (  pc->GetNext()->Is(CT_STAR)
+                    && pc->GetNext()->GetNext()->Is(CT_SEMICOLON)))
          {
             // example:
             //    using AbstractLinkPtr = AbstractLink*;
             //    using AbstractLinkPtrPtr = AbstractLink**;
-            set_chunk_type(pc, CT_PTR_TYPE);
+            pc->SetType(CT_PTR_TYPE);
          }
-         else if (  (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-                    && (  chunk_is_opening_brace(next)
+         else if (  (  pc->GetParentType() == CT_FUNC_DEF
+                    && (  next->IsBraceOpen()
                        || pc->GetNext()->IsStar()))
-                 || chunk_is_token(next, CT_QUALIFIER))               // Issue #2648
+                 || next->Is(CT_QUALIFIER))               // Issue #2648
          {
             // example:
             // auto getComponent(Color *color) -> Component * {
             // auto getComponent(Color *color) -> Component ** {
             // auto getComponent(Color *color) -> Component * _Nonnull
             // only to help the vim command }}
-            set_chunk_type(pc, CT_PTR_TYPE);
+            pc->SetType(CT_PTR_TYPE);
          }
-         else if (  chunk_is_token(pc->next, CT_SEMICOLON)      // Issue #2319
-                 || (  chunk_is_token(pc->next, CT_STAR)
-                    && chunk_is_token(pc->next->next, CT_STAR)))
+         else if (  pc->GetNext()->Is(CT_SEMICOLON)      // Issue #2319
+                 || (  pc->GetNext()->Is(CT_STAR)
+                    && pc->GetNext()->GetNext()->Is(CT_STAR)))
          {
             // more pointers are NOT yet possible
             fprintf(stderr, "Too many pointers: the maximum level of pointer indirection is 3 (i.e., ***p)\n");
-            fprintf(stderr, "at line %zu, column %zu.\n", pc->orig_line, pc->orig_col);
+            fprintf(stderr, "at line %zu, column %zu.\n", pc->GetOrigLine(), pc->GetOrigCol());
             fprintf(stderr, "Please make a report.\n");
             log_flush(true);
             exit(EX_SOFTWARE);
          }
+         else if (  !prev->TestFlags(PCF_PUNCTUATOR)
+                 || prev->Is(CT_INCDEC_AFTER)
+                 || prev->Is(CT_SQUARE_CLOSE)
+                 || prev->Is(CT_DC_MEMBER)) // Issue 1402
+         {
+            pc->SetType(CT_ARITH);
+         }
+         else if (  !prev->IsParenClose()
+                 || prev->Is(CT_SPAREN_CLOSE)
+                 || prev->GetParentType() == CT_MACRO_FUNC)
+         {
+            pc->SetType(CT_DEREF);
+         }
          else
          {
-            // Issue 1402
-            set_chunk_type(pc,
-                           (  prev->flags.test(PCF_PUNCTUATOR)
-                           && (  !chunk_is_paren_close(prev)
-                              || chunk_is_token(prev, CT_SPAREN_CLOSE)
-                              || get_chunk_parent_type(prev) == CT_MACRO_FUNC)
-                           && chunk_is_not_token(prev, CT_SQUARE_CLOSE)
-                           && chunk_is_not_token(prev, CT_DC_MEMBER)) ? CT_DEREF : CT_ARITH);
+            pc->SetType(CT_ARITH);
          }
 
-         if (pc->flags.test(PCF_IN_TYPEDEF))  // Issue #1255/#633
+         if (pc->TestFlags(PCF_IN_TYPEDEF))  // Issue #1255/#633
          {
             Chunk *tmp = pc;
 
             while (tmp->IsNotNullChunk())
             {
-               if (  chunk_is_token(tmp, CT_SEMICOLON)
-                  || chunk_is_token(tmp, CT_BRACE_OPEN)
-                  || chunk_is_token(tmp, CT_SQUARE_OPEN)) // Issue #3342
+               if (  tmp->Is(CT_SEMICOLON)
+                  || tmp->Is(CT_BRACE_OPEN)
+                  || tmp->Is(CT_SQUARE_OPEN)) // Issue #3342
                {
                   break;
                }
-               else if (chunk_is_token(tmp, CT_TYPEDEF))
+               else if (tmp->Is(CT_TYPEDEF))
                {
-                  set_chunk_type(pc, CT_PTR_TYPE);
+                  pc->SetType(CT_PTR_TYPE);
                }
                tmp = tmp->GetPrevNcNnlNi(); // Issue #2279
             }
@@ -1504,79 +1536,87 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       }
    }
 
-   if (chunk_is_token(pc, CT_AMP))
+   if (pc->Is(CT_AMP))
    {
-      if (chunk_is_token(prev, CT_DELETE))
+      if (prev->Is(CT_DELETE))
       {
-         set_chunk_type(pc, CT_ADDR);
+         pc->SetType(CT_ADDR);
       }
-      else if (  chunk_is_token(prev, CT_TYPE)
-              || chunk_is_token(prev, CT_QUALIFIER))
+      else if (  prev->Is(CT_TYPE)
+              || prev->Is(CT_QUALIFIER))
       {
-         set_chunk_type(pc, CT_BYREF);
+         pc->SetType(CT_BYREF);
       }
-      else if (  chunk_is_token(prev, CT_WORD)             // Issue #3204
-              && chunk_is_token(next, CT_OPERATOR))
+      else if (  prev->Is(CT_WORD)             // Issue #3204
+              && next->Is(CT_OPERATOR))
       {
-         set_chunk_type(pc, CT_BYREF);
+         pc->SetType(CT_BYREF);
       }
-      else if (  chunk_is_token(next, CT_FPAREN_CLOSE)
-              || chunk_is_token(next, CT_COMMA))
+      else if (  next->Is(CT_FPAREN_CLOSE)
+              || next->Is(CT_COMMA))
       {
          // fix the bug #654
          // connect(&mapper, SIGNAL(mapped(QString &)), this, SLOT(onSomeEvent(QString &)));
-         set_chunk_type(pc, CT_BYREF);
+         pc->SetType(CT_BYREF);
       }
-      else if (get_chunk_parent_type(pc) == CT_USING_ALIAS)
+      else if (pc->GetParentType() == CT_USING_ALIAS)
       {
          // fix the Issue # 1689
          // using reference = value_type &;
-         set_chunk_type(pc->prev, CT_TYPE);
-         set_chunk_type(pc, CT_BYREF);
+         pc->GetPrev()->SetType(CT_TYPE);
+         pc->SetType(CT_BYREF);
       }
       else
       {
          // Issue # 1398
-         if (  pc->flags.test(PCF_IN_FCN_DEF)
-            && chunk_is_token(prev, CT_WORD)
-            && chunk_is_token(pc, CT_AMP)
-            && chunk_is_token(next, CT_WORD))
+         if (  pc->TestFlags(PCF_IN_FCN_DEF)
+            && prev->Is(CT_WORD)
+            && pc->Is(CT_AMP)
+            && next->Is(CT_WORD))
          {
             /*
              * Change CT_WORD before CT_AMP before CT_WORD to CT_TYPE
              */
-            set_chunk_type(prev, CT_TYPE);
+            prev->SetType(CT_TYPE);
+         }
+         else if (  pc->TestFlags(PCF_IN_PREPROC) // Issue #3559
+                 && pc->Is(CT_AMP)
+                 && next->Is(CT_WORD))
+         {
+            //LOG_FMT(LGUY, " ++++++++++ pc->GetFlags(): ");
+            //log_pcf_flags(LGUY, pc->GetFlags());
+            pc->SetType(CT_ADDR);
          }
          else
          {
-            set_chunk_type(pc, CT_ARITH);
+            pc->SetType(CT_ARITH);
 
-            if (  chunk_is_token(prev, CT_WORD)
-               && !chunk_is_token(next, CT_NUMBER)) // Issue #3407
+            if (  prev->Is(CT_WORD)
+               && !next->Is(CT_NUMBER)) // Issue #3407
             {
                Chunk *tmp = prev->GetPrevNcNnlNi(); // Issue #2279
 
                if (tmp->IsNotNullChunk())
                {
-                  if (  chunk_is_semicolon(tmp)
-                     || chunk_is_token(tmp, CT_BRACE_OPEN)
-                     || chunk_is_token(tmp, CT_QUALIFIER))
+                  if (  tmp->IsSemicolon()
+                     || tmp->Is(CT_BRACE_OPEN)
+                     || tmp->Is(CT_QUALIFIER))
                   {
-                     set_chunk_type(pc, CT_BYREF);
-                     set_chunk_type(prev, CT_TYPE);
+                     pc->SetType(CT_BYREF);
+                     prev->SetType(CT_TYPE);
 
-                     if (!(  chunk_is_token(next, CT_OPERATOR)
-                          || chunk_is_token(next, CT_TYPE)
-                          || chunk_is_token(next, CT_DC_MEMBER)))
+                     if (!(  next->Is(CT_OPERATOR)
+                          || next->Is(CT_TYPE)
+                          || next->Is(CT_DC_MEMBER)))
                      {
-                        LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', set PCF_VAR_1ST\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-                        chunk_flags_set(next, PCF_VAR_1ST);
+                        LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', set PCF_VAR_1ST\n",
+                                __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+                        next->SetFlagBits(PCF_VAR_1ST);
                      }
                   }
-                  else if (chunk_is_token(tmp, CT_DC_MEMBER))
+                  else if (tmp->Is(CT_DC_MEMBER))
                   {
-                     set_chunk_type(prev, CT_TYPE);
+                     prev->SetType(CT_TYPE);
                   }
                }
             }
@@ -1584,23 +1624,23 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       }
    }
 
-   if (  chunk_is_token(pc, CT_MINUS)
-      || chunk_is_token(pc, CT_PLUS))
+   if (  pc->Is(CT_MINUS)
+      || pc->Is(CT_PLUS))
    {
-      if (  chunk_is_token(prev, CT_POS)
-         || chunk_is_token(prev, CT_NEG)
-         || chunk_is_token(prev, CT_ARITH)
-         || chunk_is_token(prev, CT_SHIFT))
+      if (  prev->Is(CT_POS)
+         || prev->Is(CT_NEG)
+         || prev->Is(CT_ARITH)
+         || prev->Is(CT_SHIFT))
       {
-         set_chunk_type(pc, chunk_is_token(pc, CT_MINUS) ? CT_NEG : CT_POS);
+         pc->SetType(pc->Is(CT_MINUS) ? CT_NEG : CT_POS);
       }
-      else if (chunk_is_token(prev, CT_OC_CLASS))
+      else if (prev->Is(CT_OC_CLASS))
       {
-         set_chunk_type(pc, (chunk_is_token(pc, CT_MINUS)) ? CT_NEG : CT_POS);
+         pc->SetType((pc->Is(CT_MINUS)) ? CT_NEG : CT_POS);
       }
       else
       {
-         set_chunk_type(pc, CT_ARITH);
+         pc->SetType(CT_ARITH);
       }
    }
 
@@ -1611,52 +1651,48 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
     * change CT_WORD => CT_TYPE     for pc
     * change CT_STAR => CT_PTR_TYPE for pc-next
     */
-   if (chunk_is_token(pc, CT_WORD))     // here NSString
+   if (pc->Is(CT_WORD))     // here NSString
    {
-      if (pc->next != nullptr)          // here *
+      Chunk *pcNext = pc->GetNext();
+      Chunk *pcPrev = pc->GetPrev();
+
+      if (pcNext->Is(CT_STAR))                   // here *
       {
-         if (pc->next->type == CT_STAR) // here *
+         // compare text with "C" to find extern "C" instructions
+         if (pcPrev->Is(CT_STRING))
          {
-            // compare text with "C" to find extern "C" instructions
-            if (pc->prev != nullptr)
+            if (unc_text::compare(pcPrev->Text(), "\"C\"") == 0)
             {
-               if (pc->prev->type == CT_STRING)
+               if (pcPrev->GetPrev()->Is(CT_EXTERN))
                {
-                  if (unc_text::compare(pc->prev->Text(), "\"C\"") == 0)
-                  {
-                     if (pc->prev->prev->type == CT_EXTERN)
-                     {
-                        set_chunk_type(pc, CT_TYPE);            // change CT_WORD => CT_TYPE
-                        set_chunk_type(pc->next, CT_PTR_TYPE);  // change CT_STAR => CT_PTR_TYPE
-                     }
-                  }
+                  pc->SetType(CT_TYPE);                                                // change CT_WORD => CT_TYPE
+                  pcNext->SetType(CT_PTR_TYPE);                                        // change CT_STAR => CT_PTR_TYPE
                }
             }
+         }
+         // Issue #322 STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
+         Chunk *nnext = pcNext->GetNext();
 
-            // Issue #322 STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData);
-            if (  (pc->next->next != nullptr)
-               && pc->next->next->type == CT_STAR
-               && pc->flags.test(PCF_IN_CONST_ARGS))
-            {
-               // change CT_STAR => CT_PTR_TYPE
-               set_chunk_type(pc->next, CT_PTR_TYPE);
-               set_chunk_type(pc->next->next, CT_PTR_TYPE);
-            }
+         if (  nnext->Is(CT_STAR)
+            && pc->TestFlags(PCF_IN_CONST_ARGS))
+         {
+            // change CT_STAR => CT_PTR_TYPE
+            pcNext->SetType(CT_PTR_TYPE);
+            nnext->SetType(CT_PTR_TYPE);
+         }
 
-            // Issue #222 whatever3 *(func_ptr)( whatever4 *foo2, ...
-            if (  (pc->next->next != nullptr)
-               && pc->next->next->type == CT_WORD
-               && pc->flags.test(PCF_IN_FCN_DEF))
-            {
-               // look for the opening parenthesis
-               // Issue 1403
-               Chunk *tmp = pc->GetPrevType(CT_FPAREN_OPEN, pc->level - 1);
+         // Issue #222 whatever3 *(func_ptr)( whatever4 *foo2, ...
+         if (  nnext->Is(CT_WORD)
+            && pc->TestFlags(PCF_IN_FCN_DEF))
+         {
+            // look for the opening parenthesis
+            // Issue 1403
+            Chunk *tmp = pc->GetPrevType(CT_FPAREN_OPEN, pc->GetLevel() - 1);
 
-               if (  tmp->IsNotNullChunk()
-                  && get_chunk_parent_type(tmp) != CT_FUNC_CTOR_VAR)
-               {
-                  set_chunk_type(pc->next, CT_PTR_TYPE);
-               }
+            if (  tmp->IsNotNullChunk()
+               && tmp->GetParentType() != CT_FUNC_CTOR_VAR)
+            {
+               pcNext->SetType(CT_PTR_TYPE);
             }
          }
       }
@@ -1669,35 +1705,33 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
     * change CT_WORD => CT_TYPE     for pc
     * change CT_STAR => CT_PTR_TYPE for pc-next
     */
-   if (chunk_is_token(pc, CT_WORD))     // here NSString
+   if (pc->Is(CT_WORD))     // here NSString
    {
-      if (pc->next != nullptr)          // here *
+      Chunk *pcNext = pc->GetNext();
+
+      if (pcNext->Is(CT_STAR))                   // here *
       {
-         if (pc->next->type == CT_STAR) // here *
-         {
-            Chunk *tmp = pc;
+         Chunk *tmp = pc;
 
-            while (  tmp != nullptr
-                  && tmp->IsNotNullChunk())
+         while (tmp->IsNotNullChunk())
+         {
+            if (tmp->Is(CT_ATTRIBUTE))
             {
-               if (chunk_is_token(tmp, CT_ATTRIBUTE))
-               {
-                  LOG_FMT(LFCNR, "%s(%d): ATTRIBUTE found, type is %s, Text() '%s'\n",
-                          __func__, __LINE__, get_token_name(tmp->type), tmp->Text());
-                  LOG_FMT(LFCNR, "for token, type is %s, Text() '%s'\n", get_token_name(pc->type), pc->Text());
-                  // change CT_WORD => CT_TYPE
-                  set_chunk_type(pc, CT_TYPE);
-                  // change CT_STAR => CT_PTR_TYPE
-                  set_chunk_type(pc->next, CT_PTR_TYPE);
-               }
+               LOG_FMT(LFCNR, "%s(%d): ATTRIBUTE found, type is %s, Text() '%s'\n",
+                       __func__, __LINE__, get_token_name(tmp->GetType()), tmp->Text());
+               LOG_FMT(LFCNR, "for token, type is %s, Text() '%s'\n", get_token_name(pc->GetType()), pc->Text());
+               // change CT_WORD => CT_TYPE
+               pc->SetType(CT_TYPE);
+               // change CT_STAR => CT_PTR_TYPE
+               pcNext->SetType(CT_PTR_TYPE);
+            }
 
-               if (tmp->flags.test(PCF_STMT_START))
-               {
-                  // we are at beginning of the line
-                  break;
-               }
-               tmp = tmp->GetPrev();
+            if (tmp->TestFlags(PCF_STMT_START))
+            {
+               // we are at beginning of the line
+               break;
             }
+            tmp = tmp->GetPrev();
          }
       }
    }
@@ -1707,29 +1741,28 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
     * Check for using reference = value_type&;
     * is it a Type alias, alias template?
     */
-   if (chunk_is_token(pc, CT_USING))
+   if (pc->Is(CT_USING))
    {
       // look for CT_ASSIGN before CT_SEMICOLON at the end of the statement
 
-      bool       is_preproc = pc->flags.test(PCF_IN_PREPROC);
-
+      bool       is_preproc    = pc->TestFlags(PCF_IN_PREPROC);
       auto const search_assign = [&pc, &is_preproc]()
       {
          for (Chunk *temp = pc; temp->IsNotNullChunk(); temp = temp->GetNextNcNnl())
          {
-            LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                    __func__, __LINE__, temp->orig_line, temp->orig_col,
-                    temp->Text(), get_token_name(temp->type));
+            LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                    __func__, __LINE__, temp->GetOrigLine(), temp->GetOrigCol(),
+                    temp->Text(), get_token_name(temp->GetType()));
 
-            if (chunk_is_token(temp, CT_ASSIGN))
+            if (temp->Is(CT_ASSIGN))
             {
                return(true);
             }
 
-            if (  chunk_is_token(temp, CT_SEMICOLON)
+            if (  temp->Is(CT_SEMICOLON)
                || (  is_preproc
-                  && (  !temp->flags.test(PCF_IN_PREPROC)
-                     || chunk_is_token(temp, CT_PREPROC))))
+                  && (  !temp->TestFlags(PCF_IN_PREPROC)
+                     || temp->Is(CT_PREPROC))))
             {
                return(false);
             }
@@ -1745,15 +1778,15 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
          // it is a Type alias, alias template
          for (Chunk *temp = pc; temp->IsNotNullChunk(); temp = temp->GetNextNcNnl())
          {
-            if (get_chunk_parent_type(temp) == CT_NONE)
+            if (temp->GetParentType() == CT_NONE)
             {
-               set_chunk_parent(temp, CT_USING_ALIAS);
+               temp->SetParentType(CT_USING_ALIAS);
             }
 
-            if (  chunk_is_token(temp, CT_SEMICOLON)
+            if (  temp->Is(CT_SEMICOLON)
                || (  is_preproc
-                  && (  !temp->flags.test(PCF_IN_PREPROC)
-                     || chunk_is_token(temp, CT_PREPROC))))
+                  && (  !temp->TestFlags(PCF_IN_PREPROC)
+                     || temp->Is(CT_PREPROC))))
             {
                break;
             }
@@ -1762,46 +1795,46 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    }
 
    // Issue #548: inline T && someFunc(foo * *p, bar && q) { }
-   if (  chunk_is_token(pc, CT_BOOL)
-      && !pc->flags.test(PCF_IN_PREPROC)
-      && chunk_is_str(pc, "&&")
-      && chunk_ends_type(pc->prev))
+   if (  pc->Is(CT_BOOL)
+      && !pc->TestFlags(PCF_IN_PREPROC)
+      && pc->IsString("&&")
+      && chunk_ends_type(pc->GetPrev()))
    {
       Chunk *tmp = pc->GetPrev();                 // Issue #2688
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-              __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-              tmp->Text(), get_token_name(tmp->type));
-      log_pcf_flags(LFCNR, tmp->flags);
+      LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+              __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(),
+              tmp->Text(), get_token_name(tmp->GetType()));
+      log_pcf_flags(LFCNR, tmp->GetFlags());
       // look for a type
 
-      if (chunk_is_token(tmp, CT_TYPE))
+      if (tmp->Is(CT_TYPE))
       {
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col,
-                 pc->Text(), get_token_name(pc->type));
-         log_pcf_flags(LFCNR, pc->flags);
-         set_chunk_type(pc, CT_BYREF);
+         LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(),
+                 pc->Text(), get_token_name(pc->GetType()));
+         log_pcf_flags(LFCNR, pc->GetFlags());
+         pc->SetType(CT_BYREF);
       }
       // look next, is there a "assign" before the ";"
-      Chunk *semi = pc->GetNextType(CT_SEMICOLON, pc->level);                // Issue #2688
+      Chunk *semi = pc->GetNextType(CT_SEMICOLON, pc->GetLevel());                // Issue #2688
 
       if (semi->IsNotNullChunk())
       {
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                 __func__, __LINE__, semi->orig_line, semi->orig_col,
-                 semi->Text(), get_token_name(semi->type));
+         LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                 __func__, __LINE__, semi->GetOrigLine(), semi->GetOrigCol(),
+                 semi->Text(), get_token_name(semi->GetType()));
 
          for (Chunk *test_it = pc; test_it != semi; test_it = test_it->GetNext())
          {
-            LOG_FMT(LFCNR, "%s(%d): test_it->orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                    __func__, __LINE__, test_it->orig_line, test_it->orig_col,
-                    test_it->Text(), get_token_name(test_it->type));
+            LOG_FMT(LFCNR, "%s(%d): test_it orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                    __func__, __LINE__, test_it->GetOrigLine(), test_it->GetOrigCol(),
+                    test_it->Text(), get_token_name(test_it->GetType()));
 
-            if (chunk_is_token(test_it, CT_ASSIGN))
+            if (test_it->Is(CT_ASSIGN))
             {
-               // the statement is an assigment
+               // the statement is an assignment
                // && is before assign
-               set_chunk_type(pc, CT_BYREF);
+               pc->SetType(CT_BYREF);
                break;
             }
          }
@@ -1809,18 +1842,18 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
    }
 
    // Issue #1704
-   if (  chunk_is_token(pc, CT_INCDEC_AFTER)
-      && pc->flags.test(PCF_IN_PREPROC))
+   if (  pc->Is(CT_INCDEC_AFTER)
+      && pc->TestFlags(PCF_IN_PREPROC))
    {
       Chunk *tmp_2 = pc->GetNext();
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col,
-              pc->Text(), get_token_name(pc->type));
-      log_pcf_flags(LFTYPE, pc->flags);
+      LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(),
+              pc->Text(), get_token_name(pc->GetType()));
+      log_pcf_flags(LFTYPE, pc->GetFlags());
 
-      if (chunk_is_token(tmp_2, CT_WORD))
+      if (tmp_2->Is(CT_WORD))
       {
-         set_chunk_type(pc, CT_INCDEC_BEFORE);
+         pc->SetType(CT_INCDEC_BEFORE);
       }
    }
 } // do_symbol_check
@@ -1829,7 +1862,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 static void check_double_brace_init(Chunk *bo1)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LJDBI, "%s(%d): orig_line is %zu, orig_col is %zu", __func__, __LINE__, bo1->orig_line, bo1->orig_col);
+   LOG_FMT(LJDBI, "%s(%d): orig line is %zu, orig col is %zu", __func__, __LINE__, bo1->GetOrigLine(), bo1->GetOrigCol());
    Chunk *pc = bo1->GetPrevNcNnlNi();   // Issue #2279
 
    if (pc->IsNullChunk())
@@ -1837,7 +1870,7 @@ static void check_double_brace_init(Chunk *bo1)
       return;
    }
 
-   if (chunk_is_paren_close(pc))
+   if (pc->IsParenClose())
    {
       Chunk *bo2 = bo1->GetNext();
 
@@ -1846,12 +1879,12 @@ static void check_double_brace_init(Chunk *bo1)
          return;
       }
 
-      if (chunk_is_token(bo2, CT_BRACE_OPEN))
+      if (bo2->Is(CT_BRACE_OPEN))
       {
          // found a potential double brace
-         Chunk *bc2 = chunk_skip_to_match(bo2);
+         Chunk *bc2 = bo2->GetClosingParen();
 
-         if (bc2 == nullptr)
+         if (bc2->IsNullChunk())
          {
             return;
          }
@@ -1862,19 +1895,19 @@ static void check_double_brace_init(Chunk *bo1)
             return;
          }
 
-         if (chunk_is_token(bc1, CT_BRACE_CLOSE))
+         if (bc1->Is(CT_BRACE_CLOSE))
          {
-            LOG_FMT(LJDBI, " - end, orig_line is %zu, orig_col is %zu\n", bc2->orig_line, bc2->orig_col);
+            LOG_FMT(LJDBI, " - end, orig line is %zu, orig col is %zu\n", bc2->GetOrigLine(), bc2->GetOrigCol());
             // delete bo2 and bc1
-            bo1->str         += bo2->str;
-            bo1->orig_col_end = bo2->orig_col_end;
-            chunk_del(bo2);
-            set_chunk_parent(bo1, CT_DOUBLE_BRACE);
-
-            bc2->str         += bc1->str;
-            bc2->orig_col_end = bc1->orig_col_end;
-            chunk_del(bc1);
-            set_chunk_parent(bc2, CT_DOUBLE_BRACE);
+            bo1->Str() += bo2->GetStr();
+            bo1->SetOrigColEnd(bo2->GetOrigColEnd());
+            Chunk::Delete(bo2);
+            bo1->SetParentType(CT_DOUBLE_BRACE);
+
+            bc2->Str() += bc1->GetStr();
+            bc2->SetOrigColEnd(bc1->GetOrigColEnd());
+            Chunk::Delete(bc1);
+            bc2->SetParentType(CT_DOUBLE_BRACE);
             return;
          }
       }
@@ -1883,11 +1916,10 @@ static void check_double_brace_init(Chunk *bo1)
 } // check_double_brace_init
 
 
-void fix_symbols(void)
+void fix_symbols()
 {
    LOG_FUNC_ENTRY();
    Chunk *pc;
-   Chunk dummy;
 
    cpd.unc_stage = unc_stage_e::FIX_SYMBOLS;
 
@@ -1898,13 +1930,16 @@ void fix_symbols(void)
 
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (  chunk_is_token(pc, CT_FUNC_WRAP)
-         || chunk_is_token(pc, CT_TYPE_WRAP))
+      LOG_FMT(LFCNR, "%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 (  pc->Is(CT_FUNC_WRAP)
+         || pc->Is(CT_TYPE_WRAP))
       {
          handle_wrap(pc);
       }
 
-      if (chunk_is_token(pc, CT_ASSIGN))
+      if (pc->Is(CT_ASSIGN))
       {
          mark_lvalue(pc);
       }
@@ -1914,25 +1949,25 @@ void fix_symbols(void)
       Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
 
       if (  is_cpp
-         && chunk_is_token(pc, CT_BRACE_OPEN)
-         && (  chunk_is_token(prev, CT_WORD)
-            || chunk_is_token(prev, CT_TYPE)))
+         && pc->Is(CT_BRACE_OPEN)
+         && (  prev->Is(CT_WORD)
+            || prev->Is(CT_TYPE)))
       {
          mark_lvalue(pc);
       }
 
       if (  is_java
-         && chunk_is_token(pc, CT_BRACE_OPEN))
+         && pc->Is(CT_BRACE_OPEN))
       {
          check_double_brace_init(pc);
       }
 
-      if (chunk_is_token(pc, CT_ATTRIBUTE))
+      if (pc->Is(CT_ATTRIBUTE))
       {
          Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
          if (  next->IsNotNullChunk()
-            && chunk_is_token(next, CT_PAREN_OPEN))
+            && next->Is(CT_PAREN_OPEN))
          {
             flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, CT_ATTRIBUTE, false);
          }
@@ -1948,41 +1983,41 @@ void fix_symbols(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_token(pc, CT_IGNORED))
+      if (pc->Is(CT_IGNORED))
       {
          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",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      LOG_FMT(LFCNR, "%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()));
       Chunk *prev = pc->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
 
-      if (chunk_is_token(prev, CT_QUALIFIER))
+      if (prev->Is(CT_QUALIFIER))
       {
          prev = prev->GetPrevNcNnlNi(E_Scope::PREPROC);     // Issue #3513
       }
 
       if (prev->IsNullChunk())
       {
-         prev = &dummy;
+         LOG_FMT(LFCNR, "%s(%d): WARNING: 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",
-                 __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text(), get_token_name(prev->type));
+         LOG_FMT(LFCNR, "%s(%d): prev(ni) orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
+                 __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text(), get_token_name(prev->GetType()));
       }
       Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
       if (next->IsNullChunk())
       {
-         next = &dummy;
+         LOG_FMT(LFCNR, "%s(%d): WARNING: 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",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->Text(), get_token_name(next->type));
+         LOG_FMT(LFCNR, "%s(%d): next orig line     is %zu, orig col is %zu, Text() is '%s', type is %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",
               __func__, __LINE__, prev->Text(), pc->Text(), next->Text());
@@ -1990,7 +2025,7 @@ void fix_symbols(void)
       pc = pc->GetNextNcNnl();
    }
    pawn_add_virtual_semicolons();
-   process_returns();
+   process_returns_and_throws();
 
    /*
     * 2nd pass - handle variable definitions
@@ -2003,46 +2038,46 @@ void fix_symbols(void)
          && 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",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type), get_token_name(pc->parent_type));
+      LOG_FMT(LFCNR, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy), get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
 
       // Can't have a variable definition inside [ ]
       if (square_level < 0)
       {
-         if (chunk_is_token(pc, CT_SQUARE_OPEN))
+         if (pc->Is(CT_SQUARE_OPEN))
          {
-            square_level = pc->level;
+            square_level = pc->GetLevel();
          }
       }
       else
       {
-         if (pc->level <= static_cast<size_t>(square_level))
+         if (pc->GetLevel() <= static_cast<size_t>(square_level))
          {
             square_level = -1;
          }
       }
 
-      if (  chunk_is_token(pc, CT_EXTERN)
+      if (  pc->Is(CT_EXTERN)
          && language_is_set(LANG_ALLC))
       {
          Chunk *next = pc->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_STRING))
+         if (next->Is(CT_STRING))
          {
             Chunk *tmp = next->GetNextNcNnl();
 
             while (tmp->IsNotNullChunk())
             {
-               if (  chunk_is_token(tmp, CT_TYPE)
-                  || chunk_is_token(tmp, CT_BRACE_OPEN)
-                  || chunk_is_token(tmp, CT_ATTRIBUTE))
+               if (  tmp->Is(CT_TYPE)
+                  || tmp->Is(CT_BRACE_OPEN)
+                  || tmp->Is(CT_ATTRIBUTE))
                {
                   break;
                }
 
-               if (chunk_is_token(tmp, CT_WORD))
+               if (tmp->Is(CT_WORD))
                {
-                  chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
+                  tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
                   break;
                }
                tmp = tmp->GetNextNcNnl();
@@ -2050,23 +2085,23 @@ void fix_symbols(void)
          }
       }
 
-      if (  chunk_is_token(pc, CT_ATTRIBUTE)
+      if (  pc->Is(CT_ATTRIBUTE)
          && language_is_set(LANG_ALLC))
       {
          Chunk *tmp = skip_attribute_next(pc);
 
-         if (chunk_is_token(tmp, CT_WORD))
+         if (tmp->Is(CT_WORD))
          {
-            chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
+            tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
          }
       }
 
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)                       // Issue #2332
-         && get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)
+      if (  pc->Is(CT_BRACE_OPEN)                       // Issue #2332
+         && pc->GetParentType() == CT_BRACED_INIT_LIST)
       {
-         LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', look for CT_BRACE_OPEN\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-         pc = pc->GetNextType(CT_BRACE_CLOSE, pc->level);
+         LOG_FMT(LFCNR, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', look for CT_BRACE_OPEN\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+         pc = pc->GetNextType(CT_BRACE_CLOSE, pc->GetLevel());
       }
       /*
        * A variable definition is possible after at the start of a statement
@@ -2074,21 +2109,25 @@ void fix_symbols(void)
        */
       // Issue #2279
       // Issue #2478
-      LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s, parent_type is %s\n   ",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type), get_token_name(pc->parent_type));
-      log_pcf_flags(LFCNR, pc->flags);
+      LOG_FMT(LFCNR, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n   ",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy), get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
+      log_pcf_flags(LFCNR, pc->GetFlags());
 
       if (  (square_level < 0)
-         && pc->flags.test(PCF_STMT_START)
-         && (  chunk_is_token(pc, CT_QUALIFIER)
-            || chunk_is_token(pc, CT_TYPE)
-            || chunk_is_token(pc, CT_TYPENAME)
-            || chunk_is_token(pc, CT_DC_MEMBER)                         // Issue #2478
-            || chunk_is_token(pc, CT_WORD))
-         && get_chunk_parent_type(pc) != CT_BIT_COLON
-         && get_chunk_parent_type(pc) != CT_ENUM
-         && !pc->flags.test(PCF_IN_CLASS_BASE)
-         && !pc->flags.test(PCF_IN_ENUM))
+         && pc->TestFlags(PCF_STMT_START)
+         && (  pc->Is(CT_QUALIFIER)
+            || pc->Is(CT_TYPE)
+            || pc->Is(CT_TYPENAME)
+            || pc->Is(CT_DC_MEMBER)                   // Issue #2478
+            || (  pc->Is(CT_WORD)
+               && !pc->TestFlags(PCF_IN_CONDITIONAL)  // Issue #3558
+//               && language_is_set(LANG_CPP)
+                  )
+               )
+         && pc->GetParentType() != CT_BIT_COLON
+         && pc->GetParentType() != CT_ENUM
+         && !pc->TestFlags(PCF_IN_CLASS_BASE)
+         && !pc->TestFlags(PCF_IN_ENUM))
       {
          pc = fix_variable_definition(pc);
       }
@@ -2100,7 +2139,7 @@ void fix_symbols(void)
 } // fix_symbols
 
 
-static void process_returns(void)
+static void process_returns_and_throws()
 {
    LOG_FUNC_ENTRY();
    Chunk *pc;
@@ -2109,19 +2148,46 @@ static void process_returns(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_not_token(pc, CT_RETURN))
+      if (  pc->Is(CT_RETURN)
+         || pc->Is(CT_THROW))
       {
-         pc = pc->GetNextType(CT_RETURN, -1);
-         continue;
+         pc = process_return_or_throw(pc);
+      }
+      else
+      {
+         pc = pc->GetNext();
       }
-      pc = process_return(pc);
    }
 }
 
 
-static Chunk *process_return(Chunk *pc)
+static Chunk *process_return_or_throw(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
+
+   const char *nl_expr_name;
+   iarf_e     nl_expr_value;
+   const char *mod_paren_name;
+   iarf_e     mod_paren_value;
+
+   if (pc->Is(CT_RETURN))
+   {
+      nl_expr_name    = "nl_return_expr";
+      nl_expr_value   = options::nl_return_expr();
+      mod_paren_name  = "mod_paren_on_return";
+      mod_paren_value = options::mod_paren_on_return();
+   }
+   else if (pc->Is(CT_THROW))
+   {
+      nl_expr_name    = "nl_throw_expr";
+      nl_expr_value   = options::nl_throw_expr();
+      mod_paren_name  = "mod_paren_on_throw";
+      mod_paren_value = options::mod_paren_on_throw();
+   }
+   else // should never happen
+   {
+      return(pc->GetNext());
+   }
    Chunk *next;
    Chunk *temp;
    Chunk *semi;
@@ -2132,23 +2198,23 @@ static Chunk *process_return(Chunk *pc)
    next = pc->PpaGetNextNcNnl();
 
    if (  next->IsNullChunk()
-      || chunk_is_semicolon(next)
-      || chunk_is_token(next, CT_NEWLINE))
+      || next->IsSemicolon()
+      || next->Is(CT_NEWLINE))
    {
       return(next);
    }
-   log_rule_B("nl_return_expr");
+   log_rule_B(nl_expr_name);
 
-   if (  options::nl_return_expr() != IARF_IGNORE
-      && !pc->flags.test(PCF_IN_PREPROC))
+   if (  nl_expr_value != IARF_IGNORE
+      && !pc->TestFlags(PCF_IN_PREPROC))
    {
-      newline_iarf(pc, options::nl_return_expr());
+      newline_iarf(pc, nl_expr_value);
    }
 
-   if (chunk_is_token(next, CT_PAREN_OPEN))
+   if (next->Is(CT_PAREN_OPEN))
    {
-      // See if the return is fully paren'd
-      cpar = next->GetNextType(CT_PAREN_CLOSE, next->level);
+      // See if the return/throw is fully paren'd
+      cpar = next->GetNextType(CT_PAREN_CLOSE, next->GetLevel());
 
       if (cpar->IsNullChunk())
       {
@@ -2161,61 +2227,61 @@ static Chunk *process_return(Chunk *pc)
          return(Chunk::NullChunkPtr);
       }
 
-      if (  chunk_is_token(semi, CT_NEWLINE)
-         || chunk_is_semicolon(semi))
+      if (  semi->Is(CT_NEWLINE)
+         || semi->IsSemicolon())
       {
-         log_rule_B("mod_paren_on_return");
+         log_rule_B(mod_paren_name);
 
-         if (options::mod_paren_on_return() == IARF_REMOVE)
+         if (mod_paren_value == IARF_REMOVE)
          {
-            LOG_FMT(LRETURN, "%s(%d): removing parens on orig_line %zu\n",
-                    __func__, __LINE__, pc->orig_line);
+            LOG_FMT(LRETURN, "%s(%d): removing parens on orig line %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine());
 
             // lower the level of everything
             for (temp = next; temp != cpar; temp = temp->GetNext())
             {
-               if (temp->level == 0)
+               if (temp->GetLevel() == 0)
                {
-                  fprintf(stderr, "%s(%d): temp->level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, temp->orig_line, temp->orig_col);
+                  fprintf(stderr, "%s(%d): temp->GetLevel() is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                          __func__, __LINE__, temp->GetOrigLine(), temp->GetOrigCol());
                   log_flush(true);
                   exit(EX_SOFTWARE);
                }
-               temp->level--;
+               temp->SetLevel(temp->GetLevel() - 1);
             }
 
             // delete the parenthesis
-            chunk_del(next);
-            chunk_del(cpar);
+            Chunk::Delete(next);
+            Chunk::Delete(cpar);
 
             // back up following chunks
             temp = semi;
 
             while (  temp->IsNotNullChunk()
-                  && chunk_is_not_token(temp, CT_NEWLINE))
+                  && temp->IsNot(CT_NEWLINE))
             {
-               temp->column       = temp->column - 2;
-               temp->orig_col     = temp->orig_col - 2;
-               temp->orig_col_end = temp->orig_col_end - 2;
-               temp               = temp->GetNext();
+               temp->SetColumn(temp->GetColumn() - 2);
+               temp->SetOrigCol(temp->GetOrigCol() - 2);
+               temp->SetOrigColEnd(temp->GetOrigColEnd() - 2);
+               temp = temp->GetNext();
             }
          }
          else
          {
-            LOG_FMT(LRETURN, "%s(%d): keeping parens on orig_line %zu\n",
-                    __func__, __LINE__, pc->orig_line);
+            LOG_FMT(LRETURN, "%s(%d): keeping parens on orig line %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine());
 
             // mark & keep them
-            set_chunk_parent(next, CT_RETURN);
-            set_chunk_parent(cpar, CT_RETURN);
+            next->SetParentType(pc->GetType());
+            cpar->SetParentType(pc->GetType());
          }
          return(semi);
       }
    }
-   // We don't have a fully paren'd return. Should we add some?
-   log_rule_B("mod_paren_on_return");
+   // We don't have a fully paren'd return/throw. Should we add some?
+   log_rule_B(mod_paren_name);
 
-   if (!(options::mod_paren_on_return() & IARF_ADD))
+   if (!(mod_paren_value & IARF_ADD))
    {
       return(next);
    }
@@ -2225,33 +2291,33 @@ static Chunk *process_return(Chunk *pc)
    //   return {args...};    // C++11 type elision; okay
    //   return ({args...});  // ill-formed
    if (  language_is_set(LANG_CPP)
-      && chunk_is_token(next, CT_BRACE_OPEN)
-      && get_chunk_parent_type(next) == CT_BRACED_INIT_LIST)
+      && next->Is(CT_BRACE_OPEN)
+      && next->GetParentType() == CT_BRACED_INIT_LIST)
    {
       LOG_FMT(LRETURN, "%s(%d): not adding parens around braced initializer"
-              " on orig_line %zd\n",
-              __func__, __LINE__, pc->orig_line);
+              " on orig line %zd\n",
+              __func__, __LINE__, pc->GetOrigLine());
       return(next);
    }
    // find the next semicolon on the same level
    semi = next;
 
-   if (pc->flags.test(PCF_IN_PREPROC))
+   if (pc->TestFlags(PCF_IN_PREPROC))
    {
       while ((semi = semi->GetNext())->IsNotNullChunk())
       {
-         if (!semi->flags.test(PCF_IN_PREPROC))
+         if (!semi->TestFlags(PCF_IN_PREPROC))
          {
             break;
          }
 
-         if (semi->level < pc->level)
+         if (semi->GetLevel() < pc->GetLevel())
          {
             return(semi);
          }
 
-         if (  chunk_is_semicolon(semi)
-            && pc->level == semi->level)
+         if (  semi->IsSemicolon()
+            && pc->GetLevel() == semi->GetLevel())
          {
             break;
          }
@@ -2261,13 +2327,13 @@ static Chunk *process_return(Chunk *pc)
    {
       while ((semi = semi->GetNext())->IsNotNullChunk())
       {
-         if (semi->level < pc->level)
+         if (semi->GetLevel() < pc->GetLevel())
          {
             return(semi);
          }
 
-         if (  chunk_is_semicolon(semi)
-            && pc->level == semi->level)
+         if (  semi->IsSemicolon()
+            && pc->GetLevel() == semi->GetLevel())
          {
             break;
          }
@@ -2277,51 +2343,49 @@ static Chunk *process_return(Chunk *pc)
    if (semi)
    {
       // add the parenthesis
-      set_chunk_type(&chunk, CT_PAREN_OPEN);
-      set_chunk_parent(&chunk, CT_RETURN);
-      chunk.str         = "(";
-      chunk.level       = pc->level;
-      chunk.pp_level    = pc->pp_level;
-      chunk.brace_level = pc->brace_level;
-      chunk.orig_line   = pc->orig_line;
-      chunk.orig_col    = next->orig_col - 1;
-      chunk.flags       = pc->flags & PCF_COPY_FLAGS;
-      chunk_add_before(&chunk, next);
-
-      set_chunk_type(&chunk, CT_PAREN_CLOSE);
-      chunk.str       = ")";
-      chunk.orig_line = semi->orig_line;
-      chunk.orig_col  = semi->orig_col - 1;
-      cpar            = chunk_add_before(&chunk, semi);
-
-      LOG_FMT(LRETURN, "%s(%d): added parens on orig_line %zu\n",
-              __func__, __LINE__, pc->orig_line);
+      chunk.SetType(CT_PAREN_OPEN);
+      chunk.SetParentType(pc->GetType());
+      chunk.Str() = "(";
+      chunk.SetLevel(pc->GetLevel());
+      chunk.SetPpLevel(pc->GetPpLevel());
+      chunk.SetBraceLevel(pc->GetBraceLevel());
+      chunk.SetOrigLine(pc->GetOrigLine());
+      chunk.SetOrigCol(next->GetOrigCol() - 1);
+      chunk.SetFlags(pc->GetFlags() & PCF_COPY_FLAGS);
+      chunk.CopyAndAddBefore(next);
+
+      chunk.SetType(CT_PAREN_CLOSE);
+      chunk.Str() = ")";
+      chunk.SetOrigLine(semi->GetOrigLine());
+      chunk.SetOrigCol(semi->GetOrigCol() - 1);
+      cpar = chunk.CopyAndAddBefore(semi);
+
+      LOG_FMT(LRETURN, "%s(%d): added parens on orig line %zu\n",
+              __func__, __LINE__, pc->GetOrigLine());
 
       for (temp = next; temp != cpar; temp = temp->GetNext())
       {
-         temp->level++;
+         temp->SetLevel(temp->GetLevel() + 1);
       }
    }
    return(semi);
-} // process_return
+} // process_return_or_throw
 
 
 static bool is_oc_block(Chunk *pc)
 {
    return(  pc != nullptr
-         && (  get_chunk_parent_type(pc) == CT_OC_BLOCK_TYPE
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK_ARG
-            || get_chunk_parent_type(pc) == CT_OC_BLOCK
-            || chunk_is_token(pc, CT_OC_BLOCK_CARET)
-            || (  pc->next != nullptr
-               && pc->next->type == CT_OC_BLOCK_CARET)
-            || (  pc->prev != nullptr
-               && pc->prev->type == CT_OC_BLOCK_CARET)));
+         && (  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)));
 }
 
 
-void mark_comments(void)
+void mark_comments()
 {
    LOG_FUNC_ENTRY();
 
@@ -2333,29 +2397,29 @@ void mark_comments(void)
    while (cur->IsNotNullChunk())
    {
       Chunk *next   = cur->GetNextNvb();
-      bool  next_nl = next->IsNullChunk() || chunk_is_newline(next);
+      bool  next_nl = next->IsNullChunk() || next->IsNewline();
 
       if (cur->IsComment())
       {
          if (  next_nl
             && prev_nl)
          {
-            set_chunk_parent(cur, CT_COMMENT_WHOLE);
+            cur->SetParentType(CT_COMMENT_WHOLE);
          }
          else if (next_nl)
          {
-            set_chunk_parent(cur, CT_COMMENT_END);
+            cur->SetParentType(CT_COMMENT_END);
          }
          else if (prev_nl)
          {
-            set_chunk_parent(cur, CT_COMMENT_START);
+            cur->SetParentType(CT_COMMENT_START);
          }
          else
          {
-            set_chunk_parent(cur, CT_COMMENT_EMBED);
+            cur->SetParentType(CT_COMMENT_EMBED);
          }
       }
-      prev_nl = chunk_is_newline(cur);
+      prev_nl = cur->IsNewline();
       cur     = next;
    }
 }
@@ -2367,27 +2431,27 @@ static void handle_cpp_template(Chunk *pc)
 
    Chunk *tmp = pc->GetNextNcNnl();
 
-   if (chunk_is_not_token(tmp, CT_ANGLE_OPEN))
+   if (tmp->IsNot(CT_ANGLE_OPEN))
    {
       return;
    }
-   set_chunk_parent(tmp, CT_TEMPLATE);
+   tmp->SetParentType(CT_TEMPLATE);
 
-   size_t level = tmp->level;
+   size_t level = tmp->GetLevel();
 
    tmp = tmp->GetNext();
 
    while (tmp->IsNotNullChunk())
    {
-      if (  chunk_is_token(tmp, CT_CLASS)
-         || chunk_is_token(tmp, CT_STRUCT))
+      if (  tmp->Is(CT_CLASS)
+         || tmp->Is(CT_STRUCT))
       {
-         set_chunk_type(tmp, CT_TYPE);
+         tmp->SetType(CT_TYPE);
       }
-      else if (  chunk_is_token(tmp, CT_ANGLE_CLOSE)
-              && tmp->level == level)
+      else if (  tmp->Is(CT_ANGLE_CLOSE)
+              && tmp->GetLevel() == level)
       {
-         set_chunk_parent(tmp, CT_TEMPLATE);
+         tmp->SetParentType(CT_TEMPLATE);
          break;
       }
       tmp = tmp->GetNext();
@@ -2397,25 +2461,24 @@ static void handle_cpp_template(Chunk *pc)
    {
       tmp = tmp->GetNextNcNnl();
 
-      if (chunk_is_token(tmp, CT_FRIEND))
+      if (tmp->Is(CT_FRIEND))
       {
          // Account for a template friend declaration
-         set_chunk_parent(tmp, CT_TEMPLATE);
+         tmp->SetParentType(CT_TEMPLATE);
 
          tmp = tmp->GetNextNcNnl();
       }
 
-      if (  chunk_is_token(tmp, CT_CLASS)
-         || chunk_is_token(tmp, CT_STRUCT))
+      if (tmp->IsClassOrStruct())
       {
-         set_chunk_parent(tmp, CT_TEMPLATE);
+         tmp->SetParentType(CT_TEMPLATE);
 
          // REVISIT: This may be a bit risky - might need to track the { };
-         tmp = tmp->GetNextType(CT_SEMICOLON, tmp->level);
+         tmp = tmp->GetNextType(CT_SEMICOLON, tmp->GetLevel());
 
          if (tmp->IsNotNullChunk())
          {
-            set_chunk_parent(tmp, CT_TEMPLATE);
+            tmp->SetParentType(CT_TEMPLATE);
          }
       }
    }
@@ -2437,26 +2500,26 @@ static void handle_cpp_lambda(Chunk *sq_o)
    }
 
    if (  prev->IsNullChunk()
-      || (  chunk_is_not_token(prev, CT_ASSIGN)
-         && chunk_is_not_token(prev, CT_COMMA)
-         && chunk_is_not_token(prev, CT_PAREN_OPEN)   // allow Js like self invoking lambda syntax: ([](){})();
-         && chunk_is_not_token(prev, CT_FPAREN_OPEN)
-         && chunk_is_not_token(prev, CT_SQUARE_OPEN)
-         && chunk_is_not_token(prev, CT_BRACE_OPEN)
-         && chunk_is_not_token(prev, CT_SEMICOLON)
-         && chunk_is_not_token(prev, CT_RETURN)))
+      || (  prev->IsNot(CT_ASSIGN)
+         && prev->IsNot(CT_COMMA)
+         && prev->IsNot(CT_PAREN_OPEN)   // allow Js like self invoking lambda syntax: ([](){})();
+         && prev->IsNot(CT_FPAREN_OPEN)
+         && prev->IsNot(CT_SQUARE_OPEN)
+         && prev->IsNot(CT_BRACE_OPEN)
+         && prev->IsNot(CT_SEMICOLON)
+         && prev->IsNot(CT_RETURN)))
    {
       LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
       return;
    }
    Chunk *sq_c = sq_o; // assuming '[]'
 
-   if (chunk_is_token(sq_o, CT_SQUARE_OPEN))
+   if (sq_o->Is(CT_SQUARE_OPEN))
    {
       // make sure there is a ']'
-      sq_c = chunk_skip_to_match(sq_o);
+      sq_c = sq_o->GetClosingParen();
 
-      if (sq_c == nullptr)
+      if (sq_c->IsNullChunk())
       {
          LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
          return;
@@ -2466,7 +2529,7 @@ static void handle_cpp_lambda(Chunk *sq_o)
 
    // check to see if there is a lambda-specifier in the pa_o chunk;
    // assuming chunk is CT_EXECUTION_CONTEXT, ignore lambda-specifier
-   while (chunk_is_token(pa_o, CT_EXECUTION_CONTEXT))
+   while (pa_o->Is(CT_EXECUTION_CONTEXT))
    {
       // set pa_o to next chunk after this specifier
       pa_o = pa_o->GetNextNcNnl();
@@ -2480,10 +2543,10 @@ static void handle_cpp_lambda(Chunk *sq_o)
    Chunk *pa_c = Chunk::NullChunkPtr;
 
    // lambda-declarator '( params )' is optional
-   if (chunk_is_token(pa_o, CT_PAREN_OPEN))
+   if (pa_o->Is(CT_PAREN_OPEN))
    {
       // and now find the ')'
-      pa_c = chunk_skip_to_match(pa_o);
+      pa_c = pa_o->GetClosingParen();
 
       if (pa_c->IsNullChunk())
       {
@@ -2494,26 +2557,26 @@ static void handle_cpp_lambda(Chunk *sq_o)
    // Check for 'mutable' keyword: '[]() mutable {}' or []() mutable -> ret {}
    Chunk *br_o = pa_c->IsNotNullChunk() ? pa_c->GetNextNcNnl() : pa_o;
 
-   if (chunk_is_str(br_o, "mutable"))
+   if (br_o->IsString("mutable"))
    {
       br_o = br_o->GetNextNcNnl();
    }
    //TODO: also check for exception and attribute between [] ... {}
 
    // skip possible arrow syntax: '-> ret'
-   if (chunk_is_str(br_o, "->"))
+   if (br_o->IsString("->"))
    {
       ret = br_o;
       // REVISIT: really should check the stuff we are skipping
-      br_o = br_o->GetNextType(CT_BRACE_OPEN, br_o->level);
+      br_o = br_o->GetNextType(CT_BRACE_OPEN, br_o->GetLevel());
    }
 
    // skip possible CT_NOEXCEPT
-   if (chunk_is_token(br_o, CT_NOEXCEPT)) // Issue #3321
+   if (br_o->Is(CT_NOEXCEPT)) // Issue #3321
    {
       ret = br_o;
       // REVISIT: really should check the stuff we are skipping
-      br_o = br_o->GetNextType(CT_BRACE_OPEN, br_o->level);
+      br_o = br_o->GetNextType(CT_BRACE_OPEN, br_o->GetLevel());
    }
 
    if (br_o->IsNullChunk())
@@ -2522,16 +2585,16 @@ static void handle_cpp_lambda(Chunk *sq_o)
       return;
    }
 
-   if (chunk_is_not_token(br_o, CT_BRACE_OPEN))
+   if (br_o->IsNot(CT_BRACE_OPEN))
    {
       LOG_FMT(LFCNR, "%s(%d): br_o is '%s'/%s\n",
               __func__, __LINE__,
-              br_o->Text(), get_token_name(br_o->type));
+              br_o->Text(), get_token_name(br_o->GetType()));
       LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
       return;
    }
    // and now find the '}'
-   Chunk *br_c = chunk_skip_to_match(br_o);
+   Chunk *br_c = br_o->GetClosingParen();
 
    if (br_c->IsNullChunk())
    {
@@ -2540,50 +2603,50 @@ static void handle_cpp_lambda(Chunk *sq_o)
    }
 
    // This looks like a lambda expression
-   if (chunk_is_token(sq_o, CT_TSQUARE))
+   if (sq_o->Is(CT_TSQUARE))
    {
       // split into two chunks
       Chunk nc;
 
       nc = *sq_o;
-      set_chunk_type(sq_o, CT_SQUARE_OPEN);
-      sq_o->str.resize(1);
+      sq_o->SetType(CT_SQUARE_OPEN);
+      sq_o->Str().resize(1);
       /*
        * bug # 664
        *
-       * The original orig_col of CT_SQUARE_CLOSE is stored at orig_col_end
-       * of CT_TSQUARE. CT_SQUARE_CLOSE orig_col and orig_col_end values
-       * are calculate from orig_col_end of CT_TSQUARE.
+       * The original m_origCol of CT_SQUARE_CLOSE is stored at m_origColEnd
+       * of CT_TSQUARE. CT_SQUARE_CLOSE m_origCol and m_origColEnd values
+       * are calculate from m_origColEnd of CT_TSQUARE.
        */
-      nc.orig_col        = sq_o->orig_col_end - 1;
-      nc.column          = static_cast<int>(nc.orig_col);
-      nc.orig_col_end    = sq_o->orig_col_end;
-      sq_o->orig_col_end = sq_o->orig_col + 1;
+      nc.SetOrigCol(sq_o->GetOrigColEnd() - 1);
+      nc.SetColumn(nc.GetOrigCol());
+      nc.SetOrigColEnd(sq_o->GetOrigColEnd());
+      sq_o->SetOrigColEnd(sq_o->GetOrigCol() + 1);
 
-      set_chunk_type(&nc, CT_SQUARE_CLOSE);
-      nc.str.pop_front();
-      sq_c = chunk_add_after(&nc, sq_o);
+      nc.SetType(CT_SQUARE_CLOSE);
+      nc.Str().pop_front();
+      sq_c = nc.CopyAndAddAfter(sq_o);
    }
-   set_chunk_parent(sq_o, CT_CPP_LAMBDA);
-   set_chunk_parent(sq_c, CT_CPP_LAMBDA);
+   sq_o->SetParentType(CT_CPP_LAMBDA);
+   sq_c->SetParentType(CT_CPP_LAMBDA);
 
    if (pa_c->IsNotNullChunk())
    {
-      set_chunk_type(pa_o, CT_LPAREN_OPEN);                    // Issue #3054
-      set_chunk_parent(pa_o, CT_CPP_LAMBDA);
-      chunk_set_parent(pa_o, sq_o);
-      chunk_set_parent(br_o, sq_o);
-      set_chunk_type(pa_c, CT_LPAREN_CLOSE);
-      set_chunk_parent(pa_c, CT_CPP_LAMBDA);
-      chunk_set_parent(pa_c, sq_o);
-      chunk_set_parent(br_c, sq_o);
+      pa_o->SetType(CT_LPAREN_OPEN);                    // Issue #3054
+      pa_o->SetParentType(CT_CPP_LAMBDA);
+      pa_o->SetParent(sq_o);
+      br_o->SetParent(sq_o);
+      pa_c->SetType(CT_LPAREN_CLOSE);
+      pa_c->SetParentType(CT_CPP_LAMBDA);
+      pa_c->SetParent(sq_o);
+      br_c->SetParent(sq_o);
    }
-   set_chunk_parent(br_o, CT_CPP_LAMBDA);
-   set_chunk_parent(br_c, CT_CPP_LAMBDA);
+   br_o->SetParentType(CT_CPP_LAMBDA);
+   br_c->SetParentType(CT_CPP_LAMBDA);
 
    if (ret->IsNotNullChunk())
    {
-      set_chunk_type(ret, CT_CPP_LAMBDA_RET);
+      ret->SetType(CT_CPP_LAMBDA_RET);
       ret = ret->GetNextNcNnl();
 
       while (ret != br_o)
@@ -2600,16 +2663,16 @@ static void handle_cpp_lambda(Chunk *sq_o)
    //handle self calling lambda paren
    Chunk *call_pa_o = br_c->GetNextNcNnl();
 
-   if (chunk_is_token(call_pa_o, CT_PAREN_OPEN))
+   if (call_pa_o->Is(CT_PAREN_OPEN))
    {
-      Chunk *call_pa_c = chunk_skip_to_match(call_pa_o);
+      Chunk *call_pa_c = call_pa_o->GetClosingParen();
 
       if (call_pa_c->IsNotNullChunk())
       {
-         set_chunk_type(call_pa_o, CT_FPAREN_OPEN);
-         set_chunk_parent(call_pa_o, CT_FUNC_CALL);
-         set_chunk_type(call_pa_c, CT_FPAREN_CLOSE);
-         set_chunk_parent(call_pa_c, CT_FUNC_CALL);
+         call_pa_o->SetType(CT_FPAREN_OPEN);
+         call_pa_o->SetParentType(CT_FUNC_CALL);
+         call_pa_c->SetType(CT_FPAREN_CLOSE);
+         call_pa_c->SetParentType(CT_FUNC_CALL);
       }
    }
    mark_cpp_lambda(sq_o);
@@ -2623,61 +2686,60 @@ static void handle_d_template(Chunk *pc)
    Chunk *name = pc->GetNextNcNnl();
    Chunk *po   = name->GetNextNcNnl();
 
-   //if (!name || (name->type != CT_WORD && name->type != CT_WORD))  Coverity CID 76000 Same on both sides, 2016-03-16
    if (  name->IsNullChunk()
-      || chunk_is_not_token(name, CT_WORD))
+      || name->IsNot(CT_WORD))
    {
       // TODO: log an error, expected NAME
       return;
    }
 
    if (  po->IsNullChunk()
-      || chunk_is_not_token(po, CT_PAREN_OPEN))
+      || po->IsNot(CT_PAREN_OPEN))
    {
       // TODO: log an error, expected '('
       return;
    }
-   set_chunk_type(name, CT_TYPE);
-   set_chunk_parent(name, CT_TEMPLATE);
-   set_chunk_parent(po, CT_TEMPLATE);
+   name->SetType(CT_TYPE);
+   name->SetParentType(CT_TEMPLATE);
+   po->SetParentType(CT_TEMPLATE);
 
    ChunkStack cs;
    Chunk      *tmp = get_d_template_types(cs, po);
 
    if (  tmp == nullptr
-      || chunk_is_not_token(tmp, CT_PAREN_CLOSE))
+      || tmp->IsNot(CT_PAREN_CLOSE))
    {
       // TODO: log an error, expected ')'
       return;
    }
-   set_chunk_parent(tmp, CT_TEMPLATE);
+   tmp->SetParentType(CT_TEMPLATE);
 
    tmp = tmp->GetNextNcNnl();
 
-   if (chunk_is_not_token(tmp, CT_BRACE_OPEN))
+   if (tmp->IsNot(CT_BRACE_OPEN))
    {
       // TODO: log an error, expected '{'
       return;
    }
-   set_chunk_parent(tmp, CT_TEMPLATE);
+   tmp->SetParentType(CT_TEMPLATE);
    po  = tmp;
    tmp = tmp->GetNextNcNnl();
 
    while (  tmp->IsNotNullChunk()
-         && tmp->level > po->level)
+         && tmp->GetLevel() > po->GetLevel())
    {
-      if (  chunk_is_token(tmp, CT_WORD)
+      if (  tmp->Is(CT_WORD)
          && chunkstack_match(cs, tmp))
       {
-         set_chunk_type(tmp, CT_TYPE);
+         tmp->SetType(CT_TYPE);
       }
       tmp = tmp->GetNextNcNnl();
    }
-//   if (!chunk_is_token(tmp, CT_BRACE_CLOSE))
+//   if (!tmp->Is(CT_BRACE_CLOSE))
 //   {
 //      // TODO: log an error, expected '}'
 //   }
-   set_chunk_parent(tmp, CT_TEMPLATE);
+   tmp->SetParentType(CT_TEMPLATE);
 } // handle_d_template
 
 
@@ -2688,9 +2750,9 @@ Chunk *skip_template_next(Chunk *ang_open)
       return(Chunk::NullChunkPtr);
    }
 
-   if (chunk_is_token(ang_open, CT_ANGLE_OPEN))
+   if (ang_open->Is(CT_ANGLE_OPEN))
    {
-      Chunk *pc = ang_open->GetNextType(CT_ANGLE_CLOSE, ang_open->level);
+      Chunk *pc = ang_open->GetNextType(CT_ANGLE_CLOSE, ang_open->GetLevel());
 
       if (pc->IsNullChunk())
       {
@@ -2719,15 +2781,15 @@ static void handle_oc_class(Chunk *pc)
    angle_state_e as            = angle_state_e::NONE;
 
    LOG_FMT(LOCCLASS, "%s(%d): start [%s] [%s] line %zu\n",
-           __func__, __LINE__, pc->Text(), get_token_name(get_chunk_parent_type(pc)), pc->orig_line);
+           __func__, __LINE__, pc->Text(), get_token_name(pc->GetParentType()), pc->GetOrigLine());
 
-   if (get_chunk_parent_type(pc) == CT_OC_PROTOCOL)
+   if (pc->GetParentType() == CT_OC_PROTOCOL)
    {
       tmp = pc->GetNextNcNnl();
 
-      if (chunk_is_semicolon(tmp))
+      if (tmp->IsSemicolon())
       {
-         set_chunk_parent(tmp, get_chunk_parent_type(pc));
+         tmp->SetParentType(pc->GetParentType());
          LOG_FMT(LOCCLASS, "%s(%d):   bail on semicolon\n", __func__, __LINE__);
          return;
       }
@@ -2737,52 +2799,52 @@ static void handle_oc_class(Chunk *pc)
    while (  (tmp = tmp->GetNextNnl()) != nullptr
          && tmp->IsNotNullChunk())
    {
-      LOG_FMT(LOCCLASS, "%s(%d):       orig_line is %zu, [%s]\n",
-              __func__, __LINE__, tmp->orig_line, tmp->Text());
+      LOG_FMT(LOCCLASS, "%s(%d):       orig line is %zu, [%s]\n",
+              __func__, __LINE__, tmp->GetOrigLine(), tmp->Text());
 
-      if (chunk_is_token(tmp, CT_OC_END))
+      if (tmp->Is(CT_OC_END))
       {
          break;
       }
 
-      if (chunk_is_token(tmp, CT_PAREN_OPEN))
+      if (tmp->Is(CT_PAREN_OPEN))
       {
          passed_name = true;
       }
 
-      if (chunk_is_str(tmp, "<"))
+      if (tmp->IsString("<"))
       {
-         set_chunk_type(tmp, CT_ANGLE_OPEN);
+         tmp->SetType(CT_ANGLE_OPEN);
 
          if (passed_name)
          {
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
+            tmp->SetParentType(CT_OC_PROTO_LIST);
          }
          else
          {
-            set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
+            tmp->SetParentType(CT_OC_GENERIC_SPEC);
             generic_level++;
          }
          as = angle_state_e::OPEN;
       }
 
-      if (chunk_is_str(tmp, ">"))
+      if (tmp->IsString(">"))
       {
-         set_chunk_type(tmp, CT_ANGLE_CLOSE);
+         tmp->SetType(CT_ANGLE_CLOSE);
 
          if (passed_name)
          {
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
+            tmp->SetParentType(CT_OC_PROTO_LIST);
             as = angle_state_e::CLOSE;
          }
          else
          {
-            set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
+            tmp->SetParentType(CT_OC_GENERIC_SPEC);
 
             if (generic_level == 0)
             {
                fprintf(stderr, "%s(%d): generic_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col);
+                       __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol());
                log_flush(true);
                exit(EX_SOFTWARE);
             }
@@ -2795,10 +2857,10 @@ static void handle_oc_class(Chunk *pc)
          }
       }
 
-      if (chunk_is_str(tmp, ">>"))
+      if (tmp->IsString(">>"))
       {
-         set_chunk_type(tmp, CT_ANGLE_CLOSE);
-         set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
+         tmp->SetType(CT_ANGLE_CLOSE);
+         tmp->SetParentType(CT_OC_GENERIC_SPEC);
          split_off_angle_close(tmp);
          generic_level -= 1;
 
@@ -2808,41 +2870,41 @@ static void handle_oc_class(Chunk *pc)
          }
       }
 
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         && get_chunk_parent_type(tmp) != CT_ASSIGN)
+      if (  tmp->Is(CT_BRACE_OPEN)
+         && tmp->GetParentType() != CT_ASSIGN)
       {
          as = angle_state_e::CLOSE;
-         set_chunk_parent(tmp, CT_OC_CLASS);
-         tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->level);
+         tmp->SetParentType(CT_OC_CLASS);
+         tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->GetLevel());
 
          if (  tmp->IsNotNullChunk()
-            && get_chunk_parent_type(tmp) != CT_ASSIGN)
+            && tmp->GetParentType() != CT_ASSIGN)
          {
-            set_chunk_parent(tmp, CT_OC_CLASS);
+            tmp->SetParentType(CT_OC_CLASS);
          }
       }
-      else if (chunk_is_token(tmp, CT_COLON))
+      else if (tmp->Is(CT_COLON))
       {
          if (as != angle_state_e::OPEN)
          {
             passed_name = true;
          }
-         set_chunk_type(tmp, hit_scope ? CT_OC_COLON : CT_CLASS_COLON);
+         tmp->SetType(hit_scope ? CT_OC_COLON : CT_CLASS_COLON);
 
-         if (chunk_is_token(tmp, CT_CLASS_COLON))
+         if (tmp->Is(CT_CLASS_COLON))
          {
-            set_chunk_parent(tmp, CT_OC_CLASS);
+            tmp->SetParentType(CT_OC_CLASS);
          }
       }
-      else if (  chunk_is_str(tmp, "-")
-              || chunk_is_str(tmp, "+"))
+      else if (  tmp->IsString("-")
+              || tmp->IsString("+"))
       {
          as = angle_state_e::CLOSE;
 
-         if (chunk_is_newline(tmp->GetPrev()))
+         if (tmp->GetPrev()->IsNewline())
          {
-            set_chunk_type(tmp, CT_OC_SCOPE);
-            chunk_flags_set(tmp, PCF_STMT_START);
+            tmp->SetType(CT_OC_SCOPE);
+            tmp->SetFlagBits(PCF_STMT_START);
             hit_scope = true;
          }
       }
@@ -2851,22 +2913,22 @@ static void handle_oc_class(Chunk *pc)
       {
          if (passed_name)
          {
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
+            tmp->SetParentType(CT_OC_PROTO_LIST);
          }
          else
          {
-            set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
+            tmp->SetParentType(CT_OC_GENERIC_SPEC);
          }
       }
    }
 
-   if (chunk_is_token(tmp, CT_BRACE_OPEN))
+   if (tmp->Is(CT_BRACE_OPEN))
    {
-      tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->level);
+      tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->GetLevel());
 
       if (tmp->IsNotNullChunk())
       {
-         set_chunk_parent(tmp, CT_OC_CLASS);
+         tmp->SetParentType(CT_OC_CLASS);
       }
    }
 } // handle_oc_class
@@ -2892,8 +2954,8 @@ static void handle_oc_block_literal(Chunk *pc)
     * block literal: '^ RTYPE ( ARGS ) { }'
     * RTYPE and ARGS are optional
     */
-   LOG_FMT(LOCBLK, "%s(%d): block literal @ orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
+   LOG_FMT(LOCBLK, "%s(%d): block literal @ orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
 
    Chunk *apo = Chunk::NullChunkPtr; // arg paren open
    Chunk *bbo = Chunk::NullChunkPtr; // block brace open
@@ -2905,22 +2967,22 @@ static void handle_oc_block_literal(Chunk *pc)
    for (tmp = next; tmp->IsNotNullChunk(); tmp = tmp->GetNextNcNnl())
    {
       /* handle '< protocol >' */
-      if (chunk_is_str(tmp, "<"))
+      if (tmp->IsString("<"))
       {
          Chunk *ao = tmp;
-         Chunk *ac = ao->GetNextString(">", 1, ao->level);
+         Chunk *ac = ao->GetNextString(">", 1, ao->GetLevel());
 
          if (ac->IsNotNullChunk())
          {
-            set_chunk_type(ao, CT_ANGLE_OPEN);
-            set_chunk_parent(ao, CT_OC_PROTO_LIST);
-            set_chunk_type(ac, CT_ANGLE_CLOSE);
-            set_chunk_parent(ac, CT_OC_PROTO_LIST);
+            ao->SetType(CT_ANGLE_OPEN);
+            ao->SetParentType(CT_OC_PROTO_LIST);
+            ac->SetType(CT_ANGLE_CLOSE);
+            ac->SetParentType(CT_OC_PROTO_LIST);
 
             for (tmp = ao->GetNext(); tmp != ac; tmp = tmp->GetNext())
             {
-               tmp->level += 1;
-               set_chunk_parent(tmp, CT_OC_PROTO_LIST);
+               tmp->SetLevel(tmp->GetLevel() + 1);
+               tmp->SetParentType(CT_OC_PROTO_LIST);
             }
 
             tmp = ac->GetNextNcNnl();
@@ -2932,22 +2994,22 @@ static void handle_oc_block_literal(Chunk *pc)
       }
       LOG_FMT(LOCBLK, " '%s'", tmp->Text());
 
-      if (  tmp->level < pc->level
-         || chunk_is_token(tmp, CT_SEMICOLON))
+      if (  tmp->GetLevel() < pc->GetLevel()
+         || tmp->Is(CT_SEMICOLON))
       {
          LOG_FMT(LOCBLK, "[DONE]");
          break;
       }
 
-      if (tmp->level == pc->level)
+      if (tmp->GetLevel() == pc->GetLevel())
       {
-         if (chunk_is_paren_open(tmp))
+         if (tmp->IsParenOpen())
          {
             apo = tmp;
             LOG_FMT(LOCBLK, "[PAREN]");
          }
 
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
+         if (tmp->Is(CT_BRACE_OPEN))
          {
             LOG_FMT(LOCBLK, "[BRACE]");
             bbo = tmp;
@@ -2957,10 +3019,9 @@ static void handle_oc_block_literal(Chunk *pc)
    }
 
    // make sure we have braces
-   bbc = chunk_skip_to_match(bbo);
+   bbc = bbo->GetClosingParen();
 
    if (  bbo->IsNullChunk()
-      || bbc == nullptr
       || bbc->IsNullChunk())
    {
       LOG_FMT(LOCBLK, " -- no braces found\n");
@@ -2969,20 +3030,20 @@ static void handle_oc_block_literal(Chunk *pc)
    LOG_FMT(LOCBLK, "\n");
 
    // we are on a block literal for sure
-   set_chunk_type(pc, CT_OC_BLOCK_CARET);
-   set_chunk_parent(pc, CT_OC_BLOCK_EXPR);
+   pc->SetType(CT_OC_BLOCK_CARET);
+   pc->SetParentType(CT_OC_BLOCK_EXPR);
 
    // handle the optional args
    Chunk *lbp; // last before paren - end of return type, if any
 
    if (apo->IsNotNullChunk())
    {
-      Chunk *apc = chunk_skip_to_match(apo);  // arg parenthesis close
+      Chunk *apc = apo->GetClosingParen();  // arg parenthesis close
 
-      if (chunk_is_paren_close(apc))
+      if (apc->IsParenClose())
       {
-         LOG_FMT(LOCBLK, " -- marking parens @ apo->orig_line is %zu, apo->orig_col is %zu and apc->orig_line is %zu, apc->orig_col is %zu\n",
-                 apo->orig_line, apo->orig_col, apc->orig_line, apc->orig_col);
+         LOG_FMT(LOCBLK, " -- marking parens @ apo orig line is %zu, orig col is %zu and apc orig line is %zu, orig col is %zu\n",
+                 apo->GetOrigLine(), apo->GetOrigCol(), apc->GetOrigLine(), apc->GetOrigCol());
          flag_parens(apo, PCF_OC_ATYPE, CT_FPAREN_OPEN, CT_OC_BLOCK_EXPR, true);
          fix_fcn_def_params(apo);
       }
@@ -2996,15 +3057,21 @@ static void handle_oc_block_literal(Chunk *pc)
    // mark the return type, if any
    while (lbp != pc)
    {
-      LOG_FMT(LOCBLK, " -- lbp %s[%s]\n", lbp->Text(), get_token_name(lbp->type));
+      LOG_FMT(LOCBLK, " -- lbp %s[%s]\n", lbp->Text(), get_token_name(lbp->GetType()));
       make_type(lbp);
-      chunk_flags_set(lbp, PCF_OC_RTYPE);
-      set_chunk_parent(lbp, CT_OC_BLOCK_EXPR);
+      lbp->SetFlagBits(PCF_OC_RTYPE);
+      lbp->SetParentType(CT_OC_BLOCK_EXPR);
       lbp = lbp->GetPrevNcNnlNi();   // Issue #2279
    }
    // mark the braces
-   set_chunk_parent(bbo, CT_OC_BLOCK_EXPR);
-   set_chunk_parent(bbc, CT_OC_BLOCK_EXPR);
+   bbo->SetParentType(CT_OC_BLOCK_EXPR);
+   bbc->SetParentType(CT_OC_BLOCK_EXPR);
+
+   // mark the OC_BLOCK
+   for (Chunk *tmp1 = bbo; tmp1 != bbc; tmp1 = tmp1->GetNextNcNnl())
+   {
+      tmp1->SetFlagBits(PCF_OC_IN_BLOCK);
+   }
 } // handle_oc_block_literal
 
 
@@ -3017,75 +3084,75 @@ static void handle_oc_block_type(Chunk *pc)
       return;
    }
 
-   if (pc->flags.test(PCF_IN_TYPEDEF))
+   if (pc->TestFlags(PCF_IN_TYPEDEF))
    {
-      LOG_FMT(LOCBLK, "%s(%d): skip block type @ orig_line is %zu, orig_col is %zu, -- in typedef\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col);
+      LOG_FMT(LOCBLK, "%s(%d): skip block type @ orig line is %zu, orig col is %zu, -- in typedef\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
       return;
    }
    // make sure we have '( ^'
    Chunk *tpo = pc->GetPrevNcNnlNi(); // type paren open   Issue #2279
 
-   if (chunk_is_paren_open(tpo))
+   if (tpo->IsParenOpen())
    {
       /*
        * block type: 'RTYPE (^LABEL)(ARGS)'
        * LABEL is optional.
        */
-      Chunk *tpc = chunk_skip_to_match(tpo); // type close paren (after '^')
-      Chunk *nam = tpc->GetPrevNcNnlNi();    // name (if any) or '^'   Issue #2279
-      Chunk *apo = tpc->GetNextNcNnl();      // arg open paren
-      Chunk *apc = chunk_skip_to_match(apo); // arg close paren
+      Chunk *tpc = tpo->GetClosingParen(); // type close paren (after '^')
+      Chunk *nam = tpc->GetPrevNcNnlNi();  // name (if any) or '^'   Issue #2279
+      Chunk *apo = tpc->GetNextNcNnl();    // arg open paren
+      Chunk *apc = apo->GetClosingParen(); // arg close paren
 
       /*
        * If this is a block literal instead of a block type, 'nam'
        * will actually be the closing bracket of the block. We run into
        * this situation if a block literal is enclosed in parentheses.
        */
-      if (chunk_is_closing_brace(nam))
+      if (nam->IsBraceClose())
       {
          return(handle_oc_block_literal(pc));
       }
 
       // Check apo is '(' or else this might be a block literal. Issue 2643.
-      if (!chunk_is_paren_open(apo))
+      if (!apo->IsParenOpen())
       {
          return(handle_oc_block_literal(pc));
       }
 
-      if (chunk_is_paren_close(apc))
+      if (apc->IsParenClose())
       {
          Chunk   *aft = apc->GetNextNcNnl();
          E_Token pt;
 
-         if (chunk_is_str(nam, "^"))
+         if (nam->IsString("^"))
          {
-            set_chunk_type(nam, CT_PTR_TYPE);
+            nam->SetType(CT_PTR_TYPE);
             pt = CT_FUNC_TYPE;
          }
-         else if (  chunk_is_token(aft, CT_ASSIGN)
-                 || chunk_is_token(aft, CT_SEMICOLON))
+         else if (  aft->Is(CT_ASSIGN)
+                 || aft->Is(CT_SEMICOLON))
          {
-            set_chunk_type(nam, CT_FUNC_VAR);
+            nam->SetType(CT_FUNC_VAR);
             pt = CT_FUNC_VAR;
          }
          else
          {
-            set_chunk_type(nam, CT_FUNC_TYPE);
+            nam->SetType(CT_FUNC_TYPE);
             pt = CT_FUNC_TYPE;
          }
-         LOG_FMT(LOCBLK, "%s(%d): block type @ orig_line is %zu, orig_col is %zu, Text() '%s'[%s]\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, nam->Text(), get_token_name(nam->type));
-         set_chunk_type(pc, CT_PTR_TYPE);
-         set_chunk_parent(pc, pt);  //CT_OC_BLOCK_TYPE;
-         set_chunk_type(tpo, CT_TPAREN_OPEN);
-         set_chunk_parent(tpo, pt); //CT_OC_BLOCK_TYPE;
-         set_chunk_type(tpc, CT_TPAREN_CLOSE);
-         set_chunk_parent(tpc, pt); //CT_OC_BLOCK_TYPE;
-         set_chunk_type(apo, CT_FPAREN_OPEN);
-         set_chunk_parent(apo, CT_FUNC_PROTO);
-         set_chunk_type(apc, CT_FPAREN_CLOSE);
-         set_chunk_parent(apc, CT_FUNC_PROTO);
+         LOG_FMT(LOCBLK, "%s(%d): block type @ orig line is %zu, orig col is %zu, Text() '%s'[%s]\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), nam->Text(), get_token_name(nam->GetType()));
+         pc->SetType(CT_PTR_TYPE);
+         pc->SetParentType(pt);  //CT_OC_BLOCK_TYPE;
+         tpo->SetType(CT_TPAREN_OPEN);
+         tpo->SetParentType(pt); //CT_OC_BLOCK_TYPE;
+         tpc->SetType(CT_TPAREN_CLOSE);
+         tpc->SetParentType(pt); //CT_OC_BLOCK_TYPE;
+         apo->SetType(CT_FPAREN_OPEN);
+         apo->SetParentType(CT_FUNC_PROTO);
+         apc->SetType(CT_FPAREN_CLOSE);
+         apc->SetParentType(CT_FUNC_PROTO);
          fix_fcn_def_params(apo);
          mark_function_return_type(nam, tpo->GetPrevNcNnlNi(), pt);   // Issue #2279
       }
@@ -3093,29 +3160,29 @@ static void handle_oc_block_type(Chunk *pc)
 } // handle_oc_block_type
 
 
-static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, pcf_flags_t flags, bool &did_it)
+static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, T_PcfFlags flags, bool &did_it)
 {
    Chunk *paren_close;
 
-   if (  !chunk_is_paren_open(paren_open)
-      || ((paren_close = chunk_skip_to_match(paren_open)) == nullptr))
+   if (  !paren_open->IsParenOpen()
+      || ((paren_close = paren_open->GetClosingParen())->IsNullChunk()))
    {
       did_it = false;
       return(paren_open);
    }
    did_it = true;
 
-   set_chunk_parent(paren_open, ptype);
-   chunk_flags_set(paren_open, flags);
-   set_chunk_parent(paren_close, ptype);
-   chunk_flags_set(paren_close, flags);
+   paren_open->SetParentType(ptype);
+   paren_open->SetFlagBits(flags);
+   paren_close->SetParentType(ptype);
+   paren_close->SetFlagBits(flags);
 
    for (Chunk *cur = paren_open->GetNextNcNnl();
         cur != paren_close;
         cur = cur->GetNextNcNnl())
    {
-      LOG_FMT(LOCMSGD, " <%s|%s>", cur->Text(), get_token_name(cur->type));
-      chunk_flags_set(cur, flags);
+      LOG_FMT(LOCMSGD, " <%s|%s>", cur->Text(), get_token_name(cur->GetType()));
+      cur->SetFlagBits(flags);
       make_type(cur);
    }
 
@@ -3143,14 +3210,14 @@ static void handle_oc_message_decl(Chunk *pc)
 
    while ((tmp = tmp->GetNext())->IsNotNullChunk())
    {
-      if (tmp->level < pc->level)
+      if (tmp->GetLevel() < pc->GetLevel())
       {
          // should not happen
          return;
       }
 
-      if (  chunk_is_token(tmp, CT_SEMICOLON)
-         || chunk_is_token(tmp, CT_BRACE_OPEN))
+      if (  tmp->Is(CT_SEMICOLON)
+         || tmp->Is(CT_BRACE_OPEN))
       {
          break;
       }
@@ -3160,13 +3227,13 @@ static void handle_oc_message_decl(Chunk *pc)
    {
       return;
    }
-   E_Token pt = chunk_is_token(tmp, CT_SEMICOLON) ? CT_OC_MSG_SPEC : CT_OC_MSG_DECL;
+   E_Token pt = tmp->Is(CT_SEMICOLON) ? CT_OC_MSG_SPEC : CT_OC_MSG_DECL;
 
-   set_chunk_type(pc, CT_OC_SCOPE);
-   set_chunk_parent(pc, pt);
+   pc->SetType(CT_OC_SCOPE);
+   pc->SetParentType(pt);
 
-   LOG_FMT(LOCMSGD, "%s(%d): %s @ orig_line is %zu, orig_col is %zu -",
-           __func__, __LINE__, get_token_name(pt), pc->orig_line, pc->orig_col);
+   LOG_FMT(LOCMSGD, "%s(%d): %s @ orig line is %zu, orig col is %zu -",
+           __func__, __LINE__, get_token_name(pt), pc->GetOrigLine(), pc->GetOrigCol());
 
    // format: -(TYPE) NAME [: (TYPE)NAME
 
@@ -3180,7 +3247,7 @@ static void handle_oc_message_decl(Chunk *pc)
    }
 
    // expect the method name/label
-   if (chunk_is_not_token(tmp, CT_WORD))
+   if (tmp->IsNot(CT_WORD))
    {
       LOG_FMT(LOCMSGD, " -- missing method name\n");
       return;
@@ -3188,35 +3255,35 @@ static void handle_oc_message_decl(Chunk *pc)
 
    Chunk *label = tmp;
 
-   set_chunk_type(tmp, pt);
-   set_chunk_parent(tmp, pt);
+   tmp->SetType(pt);
+   tmp->SetParentType(pt);
    pc = tmp->GetNextNcNnl();
 
-   LOG_FMT(LOCMSGD, " [%s]%s", pc->Text(), get_token_name(pc->type));
+   LOG_FMT(LOCMSGD, " [%s]%s", pc->Text(), get_token_name(pc->GetType()));
 
    // if we have a colon next, we have args
-   if (  chunk_is_token(pc, CT_COLON)
-      || chunk_is_token(pc, CT_OC_COLON))
+   if (  pc->Is(CT_COLON)
+      || pc->Is(CT_OC_COLON))
    {
       pc = label;
 
       while (true)
       {
          // skip optional label
-         if (  chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, pt))
+         if (  pc->Is(CT_WORD)
+            || pc->Is(pt))
          {
-            set_chunk_parent(pc, pt);
+            pc->SetParentType(pt);
             pc = pc->GetNextNcNnl();
          }
 
          // a colon must be next
-         if (!chunk_is_str(pc, ":"))
+         if (!pc->IsString(":"))
          {
             break;
          }
-         set_chunk_type(pc, CT_OC_COLON);
-         set_chunk_parent(pc, pt);
+         pc->SetType(CT_OC_COLON);
+         pc->SetParentType(pt);
          pc = pc->GetNextNcNnl();
 
          // next is the type in parens
@@ -3225,33 +3292,33 @@ static void handle_oc_message_decl(Chunk *pc)
 
          if (!did_it)
          {
-            LOG_FMT(LWARN, "%s(%d): orig_line is %zu, orig_col is %zu expected type\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
+            LOG_FMT(LWARN, "%s(%d): orig line is %zu, orig col is %zu expected type\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
             break;
          }
          // attributes for a method parameter sit between the parameter type and the parameter name
          pc = skip_attribute_next(tmp);
          // we should now be on the arg name
-         chunk_flags_set(pc, PCF_VAR_DEF);
+         pc->SetFlagBits(PCF_VAR_DEF);
          LOG_FMT(LOCMSGD, " arg[%s]", pc->Text());
          pc = pc->GetNextNcNnl();
       }
    }
    LOG_FMT(LOCMSGD, " end[%s]", pc->Text());
 
-   if (chunk_is_token(pc, CT_BRACE_OPEN))
+   if (pc->Is(CT_BRACE_OPEN))
    {
-      set_chunk_parent(pc, pt);
-      pc = chunk_skip_to_match(pc);
+      pc->SetParentType(pt);
+      pc = pc->GetClosingParen();
 
-      if (pc != nullptr)
+      if (pc->IsNotNullChunk())
       {
-         set_chunk_parent(pc, pt);
+         pc->SetParentType(pt);
       }
    }
-   else if (chunk_is_token(pc, CT_SEMICOLON))
+   else if (pc->Is(CT_SEMICOLON))
    {
-      set_chunk_parent(pc, pt);
+      pc->SetParentType(pt);
    }
    LOG_FMT(LOCMSGD, "\n");
 } // handle_oc_message_decl
@@ -3269,24 +3336,24 @@ static void handle_oc_message_send(Chunk *os)
    }
 
    while (  cs->IsNotNullChunk()
-         && cs->level > os->level)
+         && cs->GetLevel() > os->GetLevel())
    {
       cs = cs->GetNext();
    }
 
    if (  cs->IsNullChunk()
-      || chunk_is_not_token(cs, CT_SQUARE_CLOSE))
+      || cs->IsNot(CT_SQUARE_CLOSE))
    {
       return;
    }
-   LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, os->orig_line, os->orig_col);
+   LOG_FMT(LOCMSG, "%s(%d): orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, os->GetOrigLine(), os->GetOrigCol());
 
    Chunk *tmp = cs->GetNextNcNnl();
 
-   if (chunk_is_semicolon(tmp))
+   if (tmp->IsSemicolon())
    {
-      set_chunk_parent(tmp, CT_OC_MSG);
+      tmp->SetParentType(CT_OC_MSG);
    }
    // expect a word first thing or [...]
    tmp = Chunk::NullChunkPtr;
@@ -3296,87 +3363,87 @@ static void handle_oc_message_send(Chunk *os)
       tmp = os->GetNextNcNnl();
    }
 
-   if (  chunk_is_token(tmp, CT_SQUARE_OPEN)
-      || chunk_is_token(tmp, CT_PAREN_OPEN)
-      || chunk_is_token(tmp, CT_OC_AT))
+   if (  tmp->Is(CT_SQUARE_OPEN)
+      || tmp->Is(CT_PAREN_OPEN)
+      || tmp->Is(CT_OC_AT))
    {
       Chunk *tt = tmp->GetNextNcNnl();
 
-      if (  chunk_is_token(tmp, CT_OC_AT)
+      if (  tmp->Is(CT_OC_AT)
          && tt->IsNotNullChunk())
       {
-         if (  chunk_is_token(tt, CT_PAREN_OPEN)
-            || chunk_is_token(tt, CT_BRACE_OPEN)
-            || chunk_is_token(tt, CT_SQUARE_OPEN))
+         if (  tt->Is(CT_PAREN_OPEN)
+            || tt->Is(CT_BRACE_OPEN)
+            || tt->Is(CT_SQUARE_OPEN))
          {
             tmp = tt;
          }
          else
          {
-            LOG_FMT(LOCMSG, "%s(%d): tmp->orig_line is %zu, tmp->orig_col is %zu, expected identifier, not '%s' [%s]\n",
-                    __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-                    tmp->Text(), get_token_name(tmp->type));
+            LOG_FMT(LOCMSG, "%s(%d): tmp orig line is %zu, orig col is %zu, expected identifier, not '%s' [%s]\n",
+                    __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(),
+                    tmp->Text(), get_token_name(tmp->GetType()));
             return;
          }
       }
-      tmp = chunk_skip_to_match(tmp);
+      tmp = tmp->GetClosingParen();
    }
-   else if (  chunk_is_not_token(tmp, CT_WORD)
-           && chunk_is_not_token(tmp, CT_TYPE)
-           && chunk_is_not_token(tmp, CT_THIS)
-           && chunk_is_not_token(tmp, CT_STAR)
-           && chunk_is_not_token(tmp, CT_STRING))
+   else if (  tmp->IsNot(CT_WORD)
+           && tmp->IsNot(CT_TYPE)
+           && tmp->IsNot(CT_THIS)
+           && tmp->IsNot(CT_STAR)
+           && tmp->IsNot(CT_STRING))
    {
-      LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu, expected identifier, not '%s' [%s]\n",
-              __func__, __LINE__, tmp->orig_line, tmp->orig_col,
-              tmp->Text(), get_token_name(tmp->type));
+      LOG_FMT(LOCMSG, "%s(%d): orig line is %zu, orig col is %zu, expected identifier, not '%s' [%s]\n",
+              __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(),
+              tmp->Text(), get_token_name(tmp->GetType()));
       return;
    }
    else
    {
       if (tmp->IsStar()) // Issue #2722
       {
-         set_chunk_type(tmp, CT_PTR_TYPE);
+         tmp->SetType(CT_PTR_TYPE);
          tmp = tmp->GetNextNcNnl();
       }
       Chunk *tt = tmp->GetNextNcNnl();
 
-      if (chunk_is_paren_open(tt))
+      if (tt->IsParenOpen())
       {
-         LOG_FMT(LFCN, "%s(%d): (18) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
-         set_chunk_type(tmp, CT_FUNC_CALL);
+         LOG_FMT(LFCN, "%s(%d): (18) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
+         tmp->SetType(CT_FUNC_CALL);
          tmp = set_paren_parent(tt, CT_FUNC_CALL)->GetPrevNcNnlNi();   // Issue #2279
       }
       else
       {
-         set_chunk_type(tmp, CT_OC_MSG_CLASS);
+         tmp->SetType(CT_OC_MSG_CLASS);
       }
    }
-   set_chunk_parent(os, CT_OC_MSG);
-   chunk_flags_set(os, PCF_IN_OC_MSG);
-   set_chunk_parent(cs, CT_OC_MSG);
-   chunk_flags_set(cs, PCF_IN_OC_MSG);
+   os->SetParentType(CT_OC_MSG);
+   os->SetFlagBits(PCF_IN_OC_MSG);
+   cs->SetParentType(CT_OC_MSG);
+   cs->SetFlagBits(PCF_IN_OC_MSG);
 
    // handle '< protocol >'
    tmp = tmp->GetNextNcNnl();
 
-   if (chunk_is_str(tmp, "<"))
+   if (tmp->IsString("<"))
    {
       Chunk *ao = tmp;
-      Chunk *ac = ao->GetNextString(">", 1, ao->level);
+      Chunk *ac = ao->GetNextString(">", 1, ao->GetLevel());
 
       if (ac->IsNotNullChunk())
       {
-         set_chunk_type(ao, CT_ANGLE_OPEN);
-         set_chunk_parent(ao, CT_OC_PROTO_LIST);
-         set_chunk_type(ac, CT_ANGLE_CLOSE);
-         set_chunk_parent(ac, CT_OC_PROTO_LIST);
+         ao->SetType(CT_ANGLE_OPEN);
+         ao->SetParentType(CT_OC_PROTO_LIST);
+         ac->SetType(CT_ANGLE_CLOSE);
+         ac->SetParentType(CT_OC_PROTO_LIST);
 
          for (tmp = ao->GetNext(); tmp != ac; tmp = tmp->GetNext())
          {
-            tmp->level += 1;
-            set_chunk_parent(tmp, CT_OC_PROTO_LIST);
+            tmp->SetLevel(tmp->GetLevel() + 1);
+            tmp->SetParentType(CT_OC_PROTO_LIST);
          }
 
          tmp = ac->GetNextNcNnl();
@@ -3391,12 +3458,12 @@ static void handle_oc_message_send(Chunk *os)
    {
       while (tmp->IsNotNullChunk())
       {
-         if (chunk_is_token(tmp, CT_MEMBER))  // move past [object.prop1.prop2
+         if (tmp->Is(CT_MEMBER))  // move past [object.prop1.prop2
          {
             Chunk *typ = tmp->GetNextNcNnl();
 
-            if (  chunk_is_token(typ, CT_WORD)
-               || chunk_is_token(typ, CT_TYPE))
+            if (  typ->Is(CT_WORD)
+               || typ->Is(CT_TYPE))
             {
                tmp = typ->GetNextNcNnl();
             }
@@ -3405,17 +3472,17 @@ static void handle_oc_message_send(Chunk *os)
                break;
             }
          }
-         else if (chunk_is_token(tmp, CT_SQUARE_OPEN))  // move past [collection[index]
+         else if (tmp->Is(CT_SQUARE_OPEN))  // move past [collection[index]
          {
             Chunk *tcs = tmp->GetNextNcNnl();
 
             while (  tcs->IsNotNullChunk()
-                  && tcs->level > tmp->level)
+                  && tcs->GetLevel() > tmp->GetLevel())
             {
                tcs = tcs->GetNextNcNnl();
             }
 
-            if (chunk_is_token(tcs, CT_SQUARE_CLOSE))
+            if (tcs->Is(CT_SQUARE_CLOSE))
             {
                tmp = tcs->GetNextNcNnl();
             }
@@ -3432,42 +3499,45 @@ static void handle_oc_message_send(Chunk *os)
    }
 
    // [(self.foo.bar) method]
-   if (chunk_is_paren_open(tmp))
+   if (tmp->IsParenOpen())
    {
-      tmp = chunk_skip_to_match(tmp)->GetNextNcNnl();
+      tmp = tmp->GetClosingParen()->GetNextNcNnl();
    }
 
-   if (  chunk_is_token(tmp, CT_WORD)
-      || chunk_is_token(tmp, CT_TYPE))
+   if (  tmp->Is(CT_WORD)
+      || tmp->Is(CT_ACCESS)
+      || tmp->Is(CT_TYPE))
    {
-      set_chunk_type(tmp, CT_OC_MSG_FUNC);
+      tmp->SetType(CT_OC_MSG_FUNC);
    }
    Chunk *prev = Chunk::NullChunkPtr;
 
    for (tmp = os->GetNext(); tmp != cs; tmp = tmp->GetNext())
    {
-      chunk_flags_set(tmp, PCF_IN_OC_MSG);
+      tmp->SetFlagBits(PCF_IN_OC_MSG);
 
-      if (tmp->level == cs->level + 1)
+      if (tmp->GetLevel() == cs->GetLevel() + 1)
       {
-         if (chunk_is_token(tmp, CT_COLON))
+         if (  tmp->Is(CT_COLON)
+            || tmp->Is(CT_ACCESS_COLON))
          {
-            set_chunk_type(tmp, CT_OC_COLON);
+            tmp->SetType(CT_OC_COLON);
 
-            if (  chunk_is_token(prev, CT_WORD)
-               || chunk_is_token(prev, CT_TYPE))
+            if (  prev->Is(CT_WORD)
+               || prev->Is(CT_ACCESS)
+               || prev->Is(CT_TYPE))
             {
                // Might be a named param, check previous block
                Chunk *pp = prev->GetPrev();
 
                if (  pp->IsNotNullChunk()
-                  && chunk_is_not_token(pp, CT_OC_COLON)
-                  && chunk_is_not_token(pp, CT_ARITH)
-                  && chunk_is_not_token(pp, CT_SHIFT)
-                  && chunk_is_not_token(pp, CT_CARET))
+                  && pp->IsNot(CT_OC_COLON)
+                  && pp->IsNot(CT_ARITH)
+                  && pp->IsNot(CT_SHIFT)
+                  && pp->IsNot(CT_CARET))
                {
-                  set_chunk_type(prev, CT_OC_MSG_NAME);
-                  set_chunk_parent(tmp, CT_OC_MSG_NAME);
+                  prev->SetType(CT_OC_MSG_NAME);
+                  tmp->SetParentType(CT_OC_MSG_NAME);
                }
             }
          }
@@ -3490,8 +3560,8 @@ static void handle_oc_available(Chunk *os)
 
    while (os->IsNotNullChunk())
    {
-      E_Token origType = os->type;
-      set_chunk_type(os, CT_OC_AVAILABLE_VALUE);
+      E_Token origType = os->GetType();
+      os->SetType(CT_OC_AVAILABLE_VALUE);
 
       if (origType == CT_PAREN_CLOSE)
       {
@@ -3527,7 +3597,7 @@ static void handle_oc_property_decl(Chunk *os)
       std::vector<ChunkGroup> nullability_chunks; // nonnull, nullable, null_unspecified, null_resettable
       std::vector<ChunkGroup> other_chunks;       // any words other than above
 
-      if (chunk_is_token(next, CT_PAREN_OPEN))
+      if (next->Is(CT_PAREN_OPEN))
       {
          open_paren = next;
          next       = next->GetNext();
@@ -3540,36 +3610,36 @@ static void handle_oc_property_decl(Chunk *os)
           * when I attempted to add them so this is my hack for now.
           */
          while (  next->IsNotNullChunk()
-               && chunk_is_not_token(next, CT_PAREN_CLOSE))
+               && next->IsNot(CT_PAREN_CLOSE))
          {
-            if (chunk_is_token(next, CT_OC_PROPERTY_ATTR))
+            if (next->Is(CT_OC_PROPERTY_ATTR))
             {
-               if (  chunk_is_str(next, "atomic")
-                  || chunk_is_str(next, "nonatomic"))
+               if (  next->IsString("atomic")
+                  || next->IsString("nonatomic"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   thread_chunks.push_back(chunkGroup);
                }
-               else if (  chunk_is_str(next, "readonly")
-                       || chunk_is_str(next, "readwrite"))
+               else if (  next->IsString("readonly")
+                       || next->IsString("readwrite"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   readwrite_chunks.push_back(chunkGroup);
                }
-               else if (  chunk_is_str(next, "assign")
-                       || chunk_is_str(next, "retain")
-                       || chunk_is_str(next, "copy")
-                       || chunk_is_str(next, "strong")
-                       || chunk_is_str(next, "weak")
-                       || chunk_is_str(next, "unsafe_unretained"))
+               else if (  next->IsString("assign")
+                       || next->IsString("retain")
+                       || next->IsString("copy")
+                       || next->IsString("strong")
+                       || next->IsString("weak")
+                       || next->IsString("unsafe_unretained"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   ref_chunks.push_back(chunkGroup);
                }
-               else if (chunk_is_str(next, "getter"))
+               else if (next->IsString("getter"))
                {
                   ChunkGroup chunkGroup;
 
@@ -3578,8 +3648,8 @@ static void handle_oc_property_decl(Chunk *os)
                      chunkGroup.push_back(next);
                      next = next->GetNext();
                   } while (  next->IsNotNullChunk()
-                          && chunk_is_not_token(next, CT_COMMA)
-                          && chunk_is_not_token(next, CT_PAREN_CLOSE));
+                          && next->IsNot(CT_COMMA)
+                          && next->IsNot(CT_PAREN_CLOSE));
 
                   next = next->GetPrev();
 
@@ -3590,7 +3660,7 @@ static void handle_oc_property_decl(Chunk *os)
                   }
                   getter_chunks.push_back(chunkGroup);
                }
-               else if (chunk_is_str(next, "setter"))
+               else if (next->IsString("setter"))
                {
                   ChunkGroup chunkGroup;
 
@@ -3599,8 +3669,8 @@ static void handle_oc_property_decl(Chunk *os)
                      chunkGroup.push_back(next);
                      next = next->GetNext();
                   } while (  next->IsNotNullChunk()
-                          && chunk_is_not_token(next, CT_COMMA)
-                          && chunk_is_not_token(next, CT_PAREN_CLOSE));
+                          && next->IsNot(CT_COMMA)
+                          && next->IsNot(CT_PAREN_CLOSE));
 
                   if (next->IsNotNullChunk())
                   {
@@ -3613,16 +3683,16 @@ static void handle_oc_property_decl(Chunk *os)
                   }
                   setter_chunks.push_back(chunkGroup);
                }
-               else if (  chunk_is_str(next, "nullable")
-                       || chunk_is_str(next, "nonnull")
-                       || chunk_is_str(next, "null_resettable")
-                       || chunk_is_str(next, "null_unspecified"))
+               else if (  next->IsString("nullable")
+                       || next->IsString("nonnull")
+                       || next->IsString("null_resettable")
+                       || next->IsString("null_unspecified"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   nullability_chunks.push_back(chunkGroup);
                }
-               else if (chunk_is_str(next, "class"))
+               else if (next->IsString("class"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
@@ -3635,9 +3705,9 @@ static void handle_oc_property_decl(Chunk *os)
                   other_chunks.push_back(chunkGroup);
                }
             }
-            else if (chunk_is_word(next))
+            else if (next->IsWord())
             {
-               if (chunk_is_str(next, "class"))
+               if (next->IsString("class"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
@@ -3688,11 +3758,11 @@ static void handle_oc_property_decl(Chunk *os)
             {
                for (auto chunk : chunk_group)
                {
-                  chunk->orig_prev_sp = 0;
+                  chunk->SetOrigPrevSp(0);
 
                   if (chunk != curr_chunk)
                   {
-                     chunk_move_after(chunk, curr_chunk);
+                     chunk->MoveAfter(curr_chunk);
                      curr_chunk = chunk;
                   }
                   else
@@ -3703,17 +3773,17 @@ static void handle_oc_property_decl(Chunk *os)
 
                // add the parenthesis
                Chunk endchunk;
-               set_chunk_type(&endchunk, CT_COMMA);
-               set_chunk_parent(&endchunk, get_chunk_parent_type(curr_chunk));
-               endchunk.str         = ",";
-               endchunk.level       = curr_chunk->level;
-               endchunk.pp_level    = curr_chunk->pp_level;
-               endchunk.brace_level = curr_chunk->brace_level;
-               endchunk.orig_line   = curr_chunk->orig_line;
-               endchunk.orig_col    = curr_chunk->orig_col;
-               endchunk.column      = curr_chunk->orig_col_end + 1;
-               endchunk.flags       = curr_chunk->flags & PCF_COPY_FLAGS;
-               chunk_add_after(&endchunk, curr_chunk);
+               endchunk.SetType(CT_COMMA);
+               endchunk.SetParentType(curr_chunk->GetParentType());
+               endchunk.Str() = ",";
+               endchunk.SetLevel(curr_chunk->GetLevel());
+               endchunk.SetPpLevel(curr_chunk->GetPpLevel());
+               endchunk.SetBraceLevel(curr_chunk->GetBraceLevel());
+               endchunk.SetOrigLine(curr_chunk->GetOrigLine());
+               endchunk.SetOrigCol(curr_chunk->GetOrigCol());
+               endchunk.SetColumn(curr_chunk->GetOrigColEnd() + 1);
+               endchunk.SetFlags(curr_chunk->GetFlags() & PCF_COPY_FLAGS);
+               endchunk.CopyAndAddAfter(curr_chunk);
                curr_chunk = curr_chunk->GetNext();
             }
          }
@@ -3721,11 +3791,11 @@ 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()
-               && chunk_is_not_token(curr_chunk, CT_PAREN_CLOSE))
+               && curr_chunk->IsNot(CT_PAREN_CLOSE))
          {
             Chunk *rm_chunk = curr_chunk;
             curr_chunk = curr_chunk->GetNext();
-            chunk_del(rm_chunk);
+            Chunk::Delete(rm_chunk);
          }
       }
    }
@@ -3736,9 +3806,9 @@ static void handle_oc_property_decl(Chunk *os)
       tmp = os->GetNextNcNnl();
    }
 
-   if (chunk_is_paren_open(tmp))
+   if (tmp->IsParenOpen())
    {
-      tmp = chunk_skip_to_match(tmp)->GetNextNcNnl();
+      tmp = tmp->GetClosingParen()->GetNextNcNnl();
    }
    fix_variable_definition(tmp);
 } // handle_oc_property_decl
@@ -3755,28 +3825,28 @@ static void handle_cs_square_stmt(Chunk *os)
    Chunk *cs = os->GetNext();
 
    while (  cs->IsNotNullChunk()
-         && cs->level > os->level)
+         && cs->GetLevel() > os->GetLevel())
    {
       cs = cs->GetNext();
    }
 
    if (  cs->IsNullChunk()
-      || chunk_is_not_token(cs, CT_SQUARE_CLOSE))
+      || cs->IsNot(CT_SQUARE_CLOSE))
    {
       return;
    }
-   set_chunk_parent(os, CT_CS_SQ_STMT);
-   set_chunk_parent(cs, CT_CS_SQ_STMT);
+   os->SetParentType(CT_CS_SQ_STMT);
+   cs->SetParentType(CT_CS_SQ_STMT);
 
    Chunk *tmp;
 
    for (tmp = os->GetNext(); tmp != cs; tmp = tmp->GetNext())
    {
-      set_chunk_parent(tmp, CT_CS_SQ_STMT);
+      tmp->SetParentType(CT_CS_SQ_STMT);
 
-      if (chunk_is_token(tmp, CT_COLON))
+      if (tmp->Is(CT_COLON))
       {
-         set_chunk_type(tmp, CT_CS_SQ_COLON);
+         tmp->SetType(CT_CS_SQ_COLON);
       }
    }
 
@@ -3784,7 +3854,7 @@ static void handle_cs_square_stmt(Chunk *os)
 
    if (tmp->IsNotNullChunk())
    {
-      chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
+      tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
    }
 } // handle_cs_square_stmt
 
@@ -3800,29 +3870,29 @@ static void handle_cs_property(Chunk *bro)
 
    while ((pc = pc->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
-      if (pc->level == bro->level)
+      if (pc->GetLevel() == bro->GetLevel())
       {
          //prevent scanning back past 'new' in expressions like new List<int> {1,2,3}
          // Issue # 1620, UNI-24090.cs
-         if (chunk_is_token(pc, CT_NEW))
+         if (pc->Is(CT_NEW))
          {
             break;
          }
 
          if (  !did_prop
-            && (  chunk_is_token(pc, CT_WORD)
-               || chunk_is_token(pc, CT_THIS)))
+            && (  pc->Is(CT_WORD)
+               || pc->Is(CT_THIS)))
          {
-            set_chunk_type(pc, CT_CS_PROPERTY);
+            pc->SetType(CT_CS_PROPERTY);
             did_prop = true;
          }
          else
          {
-            set_chunk_parent(pc, CT_CS_PROPERTY);
+            pc->SetParentType(CT_CS_PROPERTY);
             make_type(pc);
          }
 
-         if (pc->flags.test(PCF_STMT_START))
+         if (pc->TestFlags(PCF_STMT_START))
          {
             break;
          }
@@ -3841,20 +3911,20 @@ static void handle_cs_array_type(Chunk *pc)
    Chunk *prev = pc->GetPrev();
 
    for ( ;
-         chunk_is_token(prev, CT_COMMA);
+         prev->Is(CT_COMMA);
          prev = prev->GetPrev())
    {
       // empty
    }
 
-   if (chunk_is_token(prev, CT_SQUARE_OPEN))
+   if (prev->Is(CT_SQUARE_OPEN))
    {
       while (pc != prev)
       {
-         set_chunk_parent(pc, CT_TYPE);
+         pc->SetParentType(CT_TYPE);
          pc = pc->GetPrev();
       }
-      set_chunk_parent(prev, CT_TYPE);
+      prev->SetParentType(CT_TYPE);
    }
 }
 
@@ -3873,38 +3943,38 @@ static void handle_wrap(Chunk *pc)
 
    log_rule_B("sp_func_call_paren");
    log_rule_B("sp_cpp_cast_paren");
-   iarf_e pav = chunk_is_token(pc, CT_FUNC_WRAP) ?
+   iarf_e pav = pc->Is(CT_FUNC_WRAP) ?
                 options::sp_func_call_paren() :
                 options::sp_cpp_cast_paren();
 
    log_rule_B("sp_inside_fparen");
    log_rule_B("sp_inside_paren_cast");
-   iarf_e av = chunk_is_token(pc, CT_FUNC_WRAP) ?
+   iarf_e av = pc->Is(CT_FUNC_WRAP) ?
                options::sp_inside_fparen() :
                options::sp_inside_paren_cast();
 
-   if (  chunk_is_token(clp, CT_PAREN_CLOSE)
-      && chunk_is_token(opp, CT_PAREN_OPEN)
-      && (  chunk_is_token(name, CT_WORD)
-         || chunk_is_token(name, CT_TYPE)))
+   if (  clp->Is(CT_PAREN_CLOSE)
+      && opp->Is(CT_PAREN_OPEN)
+      && (  name->Is(CT_WORD)
+         || name->Is(CT_TYPE)))
    {
       const char *psp = (pav & IARF_ADD) ? " " : "";
       const char *fsp = (av & IARF_ADD) ? " " : "";
 
-      pc->str.append(psp);
-      pc->str.append("(");
-      pc->str.append(fsp);
-      pc->str.append(name->str);
-      pc->str.append(fsp);
-      pc->str.append(")");
+      pc->Str().append(psp);
+      pc->Str().append("(");
+      pc->Str().append(fsp);
+      pc->Str().append(name->GetStr());
+      pc->Str().append(fsp);
+      pc->Str().append(")");
 
-      set_chunk_type(pc, chunk_is_token(pc, CT_FUNC_WRAP) ? CT_FUNCTION : CT_TYPE);
+      pc->SetType(pc->Is(CT_FUNC_WRAP) ? CT_FUNCTION : CT_TYPE);
 
-      pc->orig_col_end = pc->orig_col + pc->Len();
+      pc->SetOrigColEnd(pc->GetOrigCol() + pc->Len());
 
-      chunk_del(opp);
-      chunk_del(name);
-      chunk_del(clp);
+      Chunk::Delete(opp);
+      Chunk::Delete(name);
+      Chunk::Delete(clp);
    }
 } // handle_wrap
 
@@ -3915,7 +3985,7 @@ static void handle_proto_wrap(Chunk *pc)
    Chunk *opp  = pc->GetNextNcNnl();
    Chunk *name = opp->GetNextNcNnl();
    Chunk *tmp  = name->GetNextNcNnl()->GetNextNcNnl();
-   Chunk *clp  = chunk_skip_to_match(opp);
+   Chunk *clp  = opp->GetClosingParen();
    Chunk *cma  = clp->GetNextNcNnl();
 
    if (  opp->IsNullChunk()
@@ -3923,60 +3993,60 @@ static void handle_proto_wrap(Chunk *pc)
       || tmp->IsNullChunk()
       || clp == nullptr
       || cma->IsNullChunk()
-      || (  chunk_is_not_token(name, CT_WORD)
-         && chunk_is_not_token(name, CT_TYPE))
-      || chunk_is_not_token(opp, CT_PAREN_OPEN))
+      || (  name->IsNot(CT_WORD)
+         && name->IsNot(CT_TYPE))
+      || opp->IsNot(CT_PAREN_OPEN))
    {
       return;
    }
 
-   if (chunk_is_token(cma, CT_SEMICOLON))
+   if (cma->Is(CT_SEMICOLON))
    {
-      set_chunk_type(pc, CT_FUNC_PROTO);
+      pc->SetType(CT_FUNC_PROTO);
    }
-   else if (chunk_is_token(cma, CT_BRACE_OPEN))
+   else if (cma->Is(CT_BRACE_OPEN))
    {
-      LOG_FMT(LFCN, "%s(%d): (19) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-      set_chunk_type(pc, CT_FUNC_DEF);
+      LOG_FMT(LFCN, "%s(%d): (19) SET TO CT_FUNC_DEF: orig line is %zu, orig col is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+      pc->SetType(CT_FUNC_DEF);
    }
    else
    {
       return;
    }
-   set_chunk_parent(opp, pc->type);
-   set_chunk_parent(clp, pc->type);
+   opp->SetParentType(pc->GetType());
+   clp->SetParentType(pc->GetType());
 
-   set_chunk_parent(tmp, CT_PROTO_WRAP);
+   tmp->SetParentType(CT_PROTO_WRAP);
 
-   if (chunk_is_token(tmp, CT_PAREN_OPEN))
+   if (tmp->Is(CT_PAREN_OPEN))
    {
       fix_fcn_def_params(tmp);
    }
    else
    {
       fix_fcn_def_params(opp);
-      set_chunk_type(name, CT_WORD);
+      name->SetType(CT_WORD);
    }
-   tmp = chunk_skip_to_match(tmp);
+   tmp = tmp->GetClosingParen();
 
-   if (tmp)
+   if (tmp->IsNotNullChunk())
    {
-      set_chunk_parent(tmp, CT_PROTO_WRAP);
+      tmp->SetParentType(CT_PROTO_WRAP);
    }
    // Mark return type (TODO: move to own function)
    tmp = pc;
 
    while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
-      if (  !chunk_is_type(tmp)
-         && chunk_is_not_token(tmp, CT_OPERATOR)
-         && chunk_is_not_token(tmp, CT_WORD)
-         && chunk_is_not_token(tmp, CT_ADDR))
+      if (  !tmp->IsTypeDefinition()
+         && tmp->IsNot(CT_OPERATOR)
+         && tmp->IsNot(CT_WORD)
+         && tmp->IsNot(CT_ADDR))
       {
          break;
       }
-      set_chunk_parent(tmp, pc->type);
+      tmp->SetParentType(pc->GetType());
       make_type(tmp);
    }
 } // handle_proto_wrap
@@ -3999,20 +4069,20 @@ static void handle_java_assert(Chunk *pc)
 
    while ((tmp = tmp->GetNext())->IsNotNullChunk())
    {
-      if (tmp->level == pc->level)
+      if (tmp->GetLevel() == pc->GetLevel())
       {
          if (  !did_colon
-            && chunk_is_token(tmp, CT_COLON))
+            && tmp->Is(CT_COLON))
          {
             did_colon = true;
-            set_chunk_parent(tmp, pc->type);
+            tmp->SetParentType(pc->GetType());
          }
 
-         if (chunk_is_token(tmp, CT_SEMICOLON))
+         if (tmp->Is(CT_SEMICOLON))
          {
-            set_chunk_parent(tmp, pc->type);
+            tmp->SetParentType(pc->GetType());
             break;
          }
       }
    }
-}
+} // handle_java_assert
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.h
index 4d17706d..5cab3494 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.h
@@ -12,6 +12,8 @@
 #include "chunk.h"
 #include "uncrustify_types.h"
 
+void mark_question_colon();
+
 
 /**
  * Change CT_INCDEC_AFTER + WORD to CT_INCDEC_BEFORE
@@ -28,7 +30,7 @@
  *   STRUCT/ENUM/UNION + WORD :: WORD => TYPE
  *   WORD + '('               :: WORD => FUNCTION
  */
-void fix_symbols(void);
+void fix_symbols();
 
 
 /**
@@ -36,7 +38,7 @@ void fix_symbols(void);
  * CT_Q_COLON, CT_LABEL_COLON, or CT_CASE_COLON.
  * It also changes the CT_WORD before CT_LABEL_COLON into CT_LABEL.
  */
-void combine_labels(void);
+void combine_labels();
 
 
 //! help function for mark_variable_definition...
@@ -44,7 +46,7 @@ bool go_on(Chunk *pc, Chunk *start);
 
 
 //! Sets the parent for comments.
-void mark_comments(void);
+void mark_comments();
 
 
 void make_type(Chunk *pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.cpp
index 7c6ce813..ebaedce0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.cpp
@@ -23,7 +23,7 @@ void fix_casts(Chunk *start)
    Chunk      *prev;
    Chunk      *first;
    Chunk      *after;
-   Chunk      *last = nullptr;
+   Chunk      *last = Chunk::NullChunkPtr;
    Chunk      *paren_close;
    const char *verb      = "likely";
    const char *detail    = "";
@@ -33,8 +33,8 @@ void fix_casts(Chunk *start)
    bool       doubtful_cast = false;
 
 
-   LOG_FMT(LCASTS, "%s(%d): start->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->Text(), start->orig_line, start->orig_col);
+   LOG_FMT(LCASTS, "%s(%d): start->Text() is '%s', orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, start->Text(), start->GetOrigLine(), start->GetOrigCol());
 
    prev = start->GetPrevNcNnlNi();   // Issue #2279
 
@@ -43,14 +43,14 @@ void fix_casts(Chunk *start)
       return;
    }
 
-   if (chunk_is_token(prev, CT_PP_DEFINED))
+   if (prev->Is(CT_PP_DEFINED))
    {
       LOG_FMT(LCASTS, "%s(%d):  -- not a cast - after defined\n",
               __func__, __LINE__);
       return;
    }
 
-   if (chunk_is_token(prev, CT_ANGLE_CLOSE))
+   if (prev->Is(CT_ANGLE_CLOSE))
    {
       LOG_FMT(LCASTS, "%s(%d):  -- not a cast - after > (template)\n",
               __func__, __LINE__);
@@ -61,40 +61,40 @@ void fix_casts(Chunk *start)
    first = pc;
 
    while (  pc->IsNotNullChunk()
-         && (  chunk_is_type(pc)
-            || chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, CT_QUALIFIER)
-            || chunk_is_token(pc, CT_DC_MEMBER)
-            || chunk_is_token(pc, CT_PP)
-            || chunk_is_token(pc, CT_STAR)
-            || chunk_is_token(pc, CT_QUESTION)
-            || chunk_is_token(pc, CT_CARET)
-            || chunk_is_token(pc, CT_TSQUARE)
-            || (  (  chunk_is_token(pc, CT_ANGLE_OPEN)
-                  || chunk_is_token(pc, CT_ANGLE_CLOSE))
+         && (  pc->IsTypeDefinition()
+            || pc->Is(CT_WORD)
+            || pc->Is(CT_QUALIFIER)
+            || pc->Is(CT_DC_MEMBER)
+            || pc->Is(CT_PP)
+            || pc->Is(CT_STAR)
+            || pc->Is(CT_QUESTION)
+            || pc->Is(CT_CARET)
+            || pc->Is(CT_TSQUARE)
+            || (  (  pc->Is(CT_ANGLE_OPEN)
+                  || pc->Is(CT_ANGLE_CLOSE))
                && language_is_set(LANG_OC | LANG_JAVA | LANG_CS | LANG_VALA | LANG_CPP))
-            || (  (  chunk_is_token(pc, CT_QUESTION)
-                  || chunk_is_token(pc, CT_COMMA)
-                  || chunk_is_token(pc, CT_MEMBER))
+            || (  (  pc->Is(CT_QUESTION)
+                  || pc->Is(CT_COMMA)
+                  || pc->Is(CT_MEMBER))
                && language_is_set(LANG_JAVA | LANG_CS | LANG_VALA))
-            || (  chunk_is_token(pc, CT_COMMA)
+            || (  pc->Is(CT_COMMA)
                && language_is_set(LANG_CPP))
-            || chunk_is_token(pc, CT_AMP)))
+            || pc->Is(CT_AMP)))
    {
-      LOG_FMT(LCASTS, "%s(%d): pc->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
+      LOG_FMT(LCASTS, "%s(%d): pc->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 (  chunk_is_token(pc, CT_WORD)
-         || (  chunk_is_token(last, CT_ANGLE_CLOSE)
-            && chunk_is_token(pc, CT_DC_MEMBER)))
+      if (  pc->Is(CT_WORD)
+         || (  last->Is(CT_ANGLE_CLOSE)
+            && pc->Is(CT_DC_MEMBER)))
       {
          word_count++;
       }
-      else if (  chunk_is_token(pc, CT_DC_MEMBER)
-              || chunk_is_token(pc, CT_MEMBER)
-              || chunk_is_token(pc, CT_PP))
+      else if (  pc->Is(CT_DC_MEMBER)
+              || pc->Is(CT_MEMBER)
+              || pc->Is(CT_PP))
       {
-         // might be negativ, such as with:
+         // might be negative, such as with:
          // a = val + (CFoo::bar_t)7;
          word_count--;
       }
@@ -104,11 +104,11 @@ void fix_casts(Chunk *start)
    }
 
    if (  pc->IsNullChunk()
-      || chunk_is_not_token(pc, CT_PAREN_CLOSE)
-      || chunk_is_token(prev, CT_OC_CLASS))
+      || pc->IsNot(CT_PAREN_CLOSE)
+      || prev->Is(CT_OC_CLASS))
    {
       LOG_FMT(LCASTS, "%s(%d):  -- not a cast, hit type is %s\n",
-              __func__, __LINE__, pc->IsNullChunk() ? "Null chunk" : get_token_name(pc->type));
+              __func__, __LINE__, pc->IsNullChunk() ? "Null chunk" : get_token_name(pc->GetType()));
       return;
    }
 
@@ -121,11 +121,11 @@ void fix_casts(Chunk *start)
    paren_close = pc;
 
    // If last is a type or star/caret, we have a cast for sure
-   if (  chunk_is_token(last, CT_STAR)
-      || chunk_is_token(last, CT_CARET)
-      || chunk_is_token(last, CT_PTR_TYPE)
-      || chunk_is_token(last, CT_TYPE)
-      || (  chunk_is_token(last, CT_ANGLE_CLOSE)
+   if (  last->Is(CT_STAR)
+      || last->Is(CT_CARET)
+      || last->Is(CT_PTR_TYPE)
+      || last->Is(CT_TYPE)
+      || (  last->Is(CT_ANGLE_CLOSE)
          && language_is_set(LANG_OC | LANG_JAVA | LANG_CS | LANG_VALA | LANG_CPP)))
    {
       verb = "for sure";
@@ -143,8 +143,8 @@ void fix_casts(Chunk *start)
       verb = "guessed";
 
       if (  (last->Len() > 3)
-         && (last->str[last->Len() - 2] == '_')
-         && (last->str[last->Len() - 1] == 't'))
+         && (last->GetStr()[last->Len() - 2] == '_')
+         && (last->GetStr()[last->Len() - 1] == 't'))
       {
          detail = " -- '_t'";
       }
@@ -153,7 +153,7 @@ void fix_casts(Chunk *start)
          detail = " -- upper case";
       }
       else if (  language_is_set(LANG_OC)
-              && chunk_is_str(last, "id"))
+              && last->IsString("id"))
       {
          detail = " -- Objective-C id";
       }
@@ -184,7 +184,7 @@ void fix_casts(Chunk *start)
       do
       {
          after = after->GetNextNcNnl();
-      } while (chunk_is_token(after, CT_PAREN_OPEN));
+      } while (after->Is(CT_PAREN_OPEN));
 
       if (after->IsNullChunk())
       {
@@ -194,62 +194,62 @@ void fix_casts(Chunk *start)
       }
       nope = false;
 
-      if (chunk_is_ptr_operator(pc))
+      if (pc->IsPointerOperator())
       {
          // star (*) and address (&) are ambiguous
-         if (  chunk_is_token(after, CT_NUMBER_FP)
-            || chunk_is_token(after, CT_NUMBER)
-            || chunk_is_token(after, CT_STRING)
+         if (  after->Is(CT_NUMBER_FP)
+            || after->Is(CT_NUMBER)
+            || after->Is(CT_STRING)
             || doubtful_cast)
          {
             nope = true;
          }
       }
-      else if (chunk_is_token(pc, CT_MINUS))
+      else if (pc->Is(CT_MINUS))
       {
          // (UINT8)-1 or (foo)-1 or (FOO)-'a'
-         if (  chunk_is_token(after, CT_STRING)
+         if (  after->Is(CT_STRING)
             || doubtful_cast)
          {
             nope = true;
          }
       }
-      else if (chunk_is_token(pc, CT_PLUS))
+      else if (pc->Is(CT_PLUS))
       {
          // (UINT8)+1 or (foo)+1
-         if (  (  chunk_is_not_token(after, CT_NUMBER)
-               && chunk_is_not_token(after, CT_NUMBER_FP))
+         if (  (  after->IsNot(CT_NUMBER)
+               && after->IsNot(CT_NUMBER_FP))
             || doubtful_cast)
          {
             nope = true;
          }
       }
-      else if (  chunk_is_not_token(pc, CT_NUMBER_FP)
-              && chunk_is_not_token(pc, CT_NUMBER)
-              && chunk_is_not_token(pc, CT_WORD)
-              && chunk_is_not_token(pc, CT_THIS)
-              && chunk_is_not_token(pc, CT_TYPE)
-              && chunk_is_not_token(pc, CT_PAREN_OPEN)
-              && chunk_is_not_token(pc, CT_STRING)
-              && chunk_is_not_token(pc, CT_DECLTYPE)
-              && chunk_is_not_token(pc, CT_SIZEOF)
-              && get_chunk_parent_type(pc) != CT_SIZEOF
-              && chunk_is_not_token(pc, CT_FUNC_CALL)
-              && chunk_is_not_token(pc, CT_FUNC_CALL_USER)
-              && chunk_is_not_token(pc, CT_FUNCTION)
-              && chunk_is_not_token(pc, CT_BRACE_OPEN)
-              && (!(  chunk_is_token(pc, CT_SQUARE_OPEN)
+      else if (  pc->IsNot(CT_NUMBER_FP)
+              && pc->IsNot(CT_NUMBER)
+              && pc->IsNot(CT_WORD)
+              && pc->IsNot(CT_THIS)
+              && pc->IsNot(CT_TYPE)
+              && pc->IsNot(CT_PAREN_OPEN)
+              && pc->IsNot(CT_STRING)
+              && pc->IsNot(CT_DECLTYPE)
+              && pc->IsNot(CT_SIZEOF)
+              && pc->GetParentType() != CT_SIZEOF
+              && pc->IsNot(CT_FUNC_CALL)
+              && pc->IsNot(CT_FUNC_CALL_USER)
+              && pc->IsNot(CT_FUNCTION)
+              && pc->IsNot(CT_BRACE_OPEN)
+              && (!(  pc->Is(CT_SQUARE_OPEN)
                    && language_is_set(LANG_OC))))
       {
          LOG_FMT(LCASTS, "%s(%d):  -- not a cast - followed by Text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+                 __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
          return;
       }
 
       if (nope)
       {
          LOG_FMT(LCASTS, "%s(%d):  -- not a cast - Text() '%s' followed by type %s\n",
-                 __func__, __LINE__, pc->Text(), get_token_name(after->type));
+                 __func__, __LINE__, pc->Text(), get_token_name(after->GetType()));
          return;
       }
    }
@@ -261,17 +261,17 @@ void fix_casts(Chunk *start)
       return;
    }
 
-   if (  chunk_is_semicolon(pc)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_BOOL)               // Issue #2151
-      || chunk_is_paren_close(pc))
+   if (  pc->IsSemicolon()
+      || pc->Is(CT_COMMA)
+      || pc->Is(CT_BOOL)               // Issue #2151
+      || pc->IsParenClose())
    {
       LOG_FMT(LCASTS, "%s(%d):  -- not a cast - followed by type %s\n",
-              __func__, __LINE__, get_token_name(pc->type));
+              __func__, __LINE__, get_token_name(pc->GetType()));
       return;
    }
-   set_chunk_parent(start, CT_C_CAST);
-   set_chunk_parent(paren_close, CT_C_CAST);
+   start->SetParentType(CT_C_CAST);
+   paren_close->SetParentType(CT_C_CAST);
 
    LOG_FMT(LCASTS, "%s(%d):  -- %s c-cast: (",
            __func__, __LINE__, verb);
@@ -280,7 +280,7 @@ void fix_casts(Chunk *start)
         pc->IsNotNullChunk() && pc != paren_close;
         pc = pc->GetNextNcNnl())
    {
-      set_chunk_parent(pc, CT_C_CAST);
+      pc->SetParentType(CT_C_CAST);
       make_type(pc);
       LOG_FMT(LCASTS, " %s", pc->Text());
    }
@@ -292,11 +292,11 @@ void fix_casts(Chunk *start)
 
    if (pc->IsNotNullChunk())
    {
-      chunk_flags_set(pc, PCF_EXPR_START);
+      pc->SetFlagBits(PCF_EXPR_START);
 
-      if (chunk_is_opening_brace(pc))
+      if (pc->IsBraceOpen())
       {
-         set_paren_parent(pc, get_chunk_parent_type(start));
+         set_paren_parent(pc, start->GetParentType());
       }
    }
 } // fix_casts
@@ -310,11 +310,11 @@ void fix_fcn_def_params(Chunk *start)
    {
       return;
    }
-   LOG_FMT(LFCNP, "%s(%d): Text() '%s', type is %s, on orig_line %zu, level is %zu\n",
-           __func__, __LINE__, start->Text(), get_token_name(start->type), start->orig_line, start->level);
+   LOG_FMT(LFCNP, "%s(%d): Text() '%s', type is %s, on orig line %zu, level is %zu\n",
+           __func__, __LINE__, start->Text(), get_token_name(start->GetType()), start->GetOrigLine(), start->GetLevel());
 
    while (  start->IsNotNullChunk()
-         && !chunk_is_paren_open(start))
+         && !start->IsParenOpen())
    {
       start = start->GetNextNcNnl();
    }
@@ -325,64 +325,64 @@ void fix_fcn_def_params(Chunk *start)
    }
    // ensure start chunk holds a single '(' character
    assert(  (start->Len() == 1)
-         && (start->str[0] == '('));
+         && (start->GetStr()[0] == '('));
 
    ChunkStack cs;
-   size_t     level = start->level + 1;
+   size_t     level = start->GetLevel() + 1;
    Chunk      *pc   = start->GetNextNcNnl();
 
    while (pc->IsNotNullChunk())
    {
       if (  (  (start->Len() == 1)
-            && (start->str[0] == ')'))
-         || pc->level < level)
+            && (start->GetStr()[0] == ')'))
+         || pc->GetLevel() < level)
       {
-         LOG_FMT(LFCNP, "%s(%d): bailed on Text() '%s', on orig_line %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line);
+         LOG_FMT(LFCNP, "%s(%d): bailed on Text() '%s', on orig line %zu\n",
+                 __func__, __LINE__, pc->Text(), pc->GetOrigLine());
          break;
       }
-      LOG_FMT(LFCNP, "%s(%d): %s, Text() '%s' on orig_line %zu, level %zu\n",
-              __func__, __LINE__, (pc->level > level) ? "skipping" : "looking at",
-              pc->Text(), pc->orig_line, pc->level);
+      LOG_FMT(LFCNP, "%s(%d): %s, Text() '%s' on orig line %zu, level %zu\n",
+              __func__, __LINE__, (pc->GetLevel() > level) ? "skipping" : "looking at",
+              pc->Text(), pc->GetOrigLine(), pc->GetLevel());
 
-      if (pc->level > level)
+      if (pc->GetLevel() > level)
       {
          pc = pc->GetNextNcNnl();
          continue;
       }
 
       if (  pc->IsStar()
-         || chunk_is_msref(pc)
-         || chunk_is_nullable(pc))
+         || pc->IsMsRef()
+         || pc->IsNullable())
       {
-         set_chunk_type(pc, CT_PTR_TYPE);
+         pc->SetType(CT_PTR_TYPE);
          cs.Push_Back(pc);
       }
-      else if (  chunk_is_token(pc, CT_AMP)
-              || (  language_is_set(LANG_CPP)
-                 && chunk_is_str(pc, "&&")))
+      else if (  language_is_set(LANG_CPP)   // Issue #3662
+              && (  pc->Is(CT_AMP)
+                 || pc->IsString("&&")))
       {
-         set_chunk_type(pc, CT_BYREF);
+         pc->SetType(CT_BYREF);
          cs.Push_Back(pc);
       }
-      else if (chunk_is_token(pc, CT_TYPE_WRAP))
+      else if (pc->Is(CT_TYPE_WRAP))
       {
          cs.Push_Back(pc);
       }
-      else if (  chunk_is_token(pc, CT_WORD)
-              || chunk_is_token(pc, CT_TYPE))
+      else if (  pc->Is(CT_WORD)
+              || pc->Is(CT_TYPE))
       {
          cs.Push_Back(pc);
       }
-      else if (  chunk_is_token(pc, CT_COMMA)
-              || chunk_is_token(pc, CT_ASSIGN))
+      else if (  pc->Is(CT_COMMA)
+              || pc->Is(CT_ASSIGN))
       {
          mark_variable_stack(cs, LFCNP);
 
-         if (chunk_is_token(pc, CT_ASSIGN))
+         if (pc->Is(CT_ASSIGN))
          {
             // Mark assignment for default param spacing
-            set_chunk_parent(pc, CT_FUNC_PROTO);
+            pc->SetParentType(CT_FUNC_PROTO);
          }
       }
       pc = pc->GetNextNcNnl();
@@ -402,17 +402,17 @@ void fix_type_cast(Chunk *start)
    Chunk *pc = start->GetNextNcNnl();
 
    if (  pc->IsNullChunk()
-      || chunk_is_not_token(pc, CT_ANGLE_OPEN))
+      || pc->IsNot(CT_ANGLE_OPEN))
    {
       return;
    }
    pc = pc->GetNextNcNnl();
 
    while (  pc->IsNotNullChunk()
-         && pc->level >= start->level)
+         && pc->GetLevel() >= start->GetLevel())
    {
-      if (  pc->level == start->level
-         && chunk_is_token(pc, CT_ANGLE_CLOSE))
+      if (  pc->GetLevel() == start->GetLevel()
+         && pc->Is(CT_ANGLE_CLOSE))
       {
          pc = pc->GetNextNcNnl();
 
@@ -421,7 +421,7 @@ void fix_type_cast(Chunk *start)
             return;
          }
 
-         if (chunk_is_str(pc, "("))
+         if (pc->IsString("("))
          {
             set_paren_parent(pc, CT_TYPE_CAST);
          }
@@ -441,8 +441,8 @@ void fix_typedef(Chunk *start)
    {
       return;
    }
-   LOG_FMT(LTYPEDEF, "%s(%d): typedef @ orig_line %zu, orig_col %zu\n",
-           __func__, __LINE__, start->orig_line, start->orig_col);
+   LOG_FMT(LTYPEDEF, "%s(%d): typedef @ orig line %zu, orig col %zu\n",
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
 
    Chunk *the_type = Chunk::NullChunkPtr;
    Chunk *last_op  = Chunk::NullChunkPtr;
@@ -452,39 +452,39 @@ void fix_typedef(Chunk *start)
     * function type
     */
    for (Chunk *next = start->GetNextNcNnl(E_Scope::PREPROC)
-        ; next->IsNotNullChunk() && next->level >= start->level
+        ; next->IsNotNullChunk() && next->GetLevel() >= start->GetLevel()
         ; next = next->GetNextNcNnl(E_Scope::PREPROC))
    {
-      chunk_flags_set(next, PCF_IN_TYPEDEF);
+      next->SetFlagBits(PCF_IN_TYPEDEF);
 
-      if (start->level == next->level)
+      if (start->GetLevel() == next->GetLevel())
       {
-         if (chunk_is_semicolon(next))
+         if (next->IsSemicolon())
          {
-            set_chunk_parent(next, CT_TYPEDEF);
+            next->SetParentType(CT_TYPEDEF);
             break;
          }
 
-         if (chunk_is_token(next, CT_ATTRIBUTE))
+         if (next->Is(CT_ATTRIBUTE))
          {
             break;
          }
 
          if (  language_is_set(LANG_D)
-            && chunk_is_token(next, CT_ASSIGN))
+            && next->Is(CT_ASSIGN))
          {
-            set_chunk_parent(next, CT_TYPEDEF);
+            next->SetParentType(CT_TYPEDEF);
             break;
          }
          make_type(next);
 
-         if (chunk_is_token(next, CT_TYPE))
+         if (next->Is(CT_TYPE))
          {
             the_type = next;
          }
-         chunk_flags_clr(next, PCF_VAR_1ST_DEF);
+         next->ResetFlagBits(PCF_VAR_1ST_DEF);
 
-         if (*next->str.c_str() == '(')
+         if (*next->GetStr().c_str() == '(')
          {
             last_op = next;
          }
@@ -494,7 +494,7 @@ void fix_typedef(Chunk *start)
    // avoid interpreting typedef NS_ENUM (NSInteger, MyEnum) as a function def
    if (  last_op->IsNotNullChunk()
       && !(  language_is_set(LANG_OC)
-          && get_chunk_parent_type(last_op) == CT_ENUM))
+          && last_op->GetParentType() == CT_ENUM))
    {
       flag_parens(last_op, PCF_NONE, CT_FPAREN_OPEN, CT_TYPEDEF, false);
       fix_fcn_def_params(last_op);
@@ -505,11 +505,11 @@ void fix_typedef(Chunk *start)
       {
          return;
       }
-      Chunk *open_paren = nullptr;
+      Chunk *open_paren = Chunk::NullChunkPtr;
 
-      if (chunk_is_paren_close(the_type))
+      if (the_type->IsParenClose())
       {
-         open_paren = chunk_skip_to_match_rev(the_type);
+         open_paren = the_type->GetOpeningParen();
          mark_function_type(the_type);
          the_type = the_type->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
 
@@ -521,17 +521,17 @@ void fix_typedef(Chunk *start)
       else
       {
          // must be: "typedef <return type>func(params);"
-         set_chunk_type(the_type, CT_FUNC_TYPE);
+         the_type->SetType(CT_FUNC_TYPE);
       }
-      set_chunk_parent(the_type, CT_TYPEDEF);
+      the_type->SetParentType(CT_TYPEDEF);
 
-      LOG_FMT(LTYPEDEF, "%s(%d): fcn typedef Text() '%s', on orig_line %zu\n",
-              __func__, __LINE__, the_type->Text(), the_type->orig_line);
+      LOG_FMT(LTYPEDEF, "%s(%d): fcn typedef Text() '%s', on orig line %zu\n",
+              __func__, __LINE__, the_type->Text(), the_type->GetOrigLine());
 
       // If we are aligning on the open parenthesis, grab that instead
       log_rule_B("align_typedef_func");
 
-      if (  open_paren != nullptr
+      if (  open_paren->IsNotNullChunk()
          && options::align_typedef_func() == 1)
       {
          the_type = open_paren;
@@ -540,9 +540,9 @@ void fix_typedef(Chunk *start)
 
       if (options::align_typedef_func() != 0)
       {
-         LOG_FMT(LTYPEDEF, "%s(%d):  -- align anchor on Text() %s, @ orig_line %zu, orig_col %zu\n",
-                 __func__, __LINE__, the_type->Text(), the_type->orig_line, the_type->orig_col);
-         chunk_flags_set(the_type, PCF_ANCHOR);
+         LOG_FMT(LTYPEDEF, "%s(%d):  -- align anchor on Text() %s, @ orig line %zu, orig col %zu\n",
+                 __func__, __LINE__, the_type->Text(), the_type->GetOrigLine(), the_type->GetOrigCol());
+         the_type->SetFlagBits(PCF_ANCHOR);
       }
       // already did everything we need to do
       return;
@@ -558,17 +558,17 @@ void fix_typedef(Chunk *start)
       return;
    }
 
-   if (  chunk_is_not_token(after, CT_ENUM)
-      && chunk_is_not_token(after, CT_STRUCT)
-      && chunk_is_not_token(after, CT_UNION))
+   if (  after->IsNot(CT_ENUM)
+      && after->IsNot(CT_STRUCT)
+      && after->IsNot(CT_UNION))
    {
       if (  the_type != nullptr
          && the_type->IsNotNullChunk())
       {
          // We have just a regular typedef
-         LOG_FMT(LTYPEDEF, "%s(%d): regular typedef Text() %s, on orig_line %zu\n",
-                 __func__, __LINE__, the_type->Text(), the_type->orig_line);
-         chunk_flags_set(the_type, PCF_ANCHOR);
+         LOG_FMT(LTYPEDEF, "%s(%d): regular typedef Text() %s, on orig line %zu\n",
+                 __func__, __LINE__, the_type->Text(), the_type->GetOrigLine());
+         the_type->SetFlagBits(PCF_ANCHOR);
       }
       return;
    }
@@ -580,7 +580,7 @@ void fix_typedef(Chunk *start)
       return;
    }
 
-   if (chunk_is_token(next, CT_TYPE))
+   if (next->Is(CT_TYPE))
    {
       next = next->GetNextNcNnl(E_Scope::PREPROC);
 
@@ -590,16 +590,16 @@ void fix_typedef(Chunk *start)
       }
    }
 
-   if (chunk_is_token(next, CT_BRACE_OPEN))
+   if (next->Is(CT_BRACE_OPEN))
    {
       // Skip to the closing brace
-      Chunk *br_c = next->GetNextType(CT_BRACE_CLOSE, next->level, E_Scope::PREPROC);
+      Chunk *br_c = next->GetNextType(CT_BRACE_CLOSE, next->GetLevel(), E_Scope::PREPROC);
 
       if (br_c->IsNotNullChunk())
       {
-         const E_Token tag = after->type;
-         set_chunk_parent(next, tag);
-         set_chunk_parent(br_c, tag);
+         const E_Token tag = after->GetType();
+         next->SetParentType(tag);
+         br_c->SetParentType(tag);
 
          if (tag == CT_ENUM)
          {
@@ -615,10 +615,10 @@ void fix_typedef(Chunk *start)
    if (  the_type != nullptr
       && the_type->IsNotNullChunk())
    {
-      LOG_FMT(LTYPEDEF, "%s(%d): %s typedef Text() %s, on orig_line %zu\n",
-              __func__, __LINE__, get_token_name(after->type), the_type->Text(),
-              the_type->orig_line);
-      chunk_flags_set(the_type, PCF_ANCHOR);
+      LOG_FMT(LTYPEDEF, "%s(%d): %s typedef Text() %s, on orig line %zu\n",
+              __func__, __LINE__, get_token_name(after->GetType()), the_type->Text(),
+              the_type->GetOrigLine());
+      the_type->SetFlagBits(PCF_ANCHOR);
    }
 } // fix_typedef
 
@@ -633,21 +633,22 @@ Chunk *fix_variable_definition(Chunk *start)
    int        idx;
    int        ref_idx;
 
-   LOG_FMT(LFVD, "%s(%d): start at pc->orig_line is %zu, pc->orig_col is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
+   LOG_FMT(LFVD, "%s(%d): start at pc orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+   log_pcf_flags(LFCNR, pc->GetFlags());
 
    // Scan for words and types and stars oh my!
-   while (  chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_QUALIFIER)
-         || chunk_is_token(pc, CT_TYPENAME)
-         || chunk_is_token(pc, CT_DC_MEMBER)
-         || chunk_is_token(pc, CT_MEMBER)
-         || chunk_is_token(pc, CT_PP)                       // Issue #3169
-         || chunk_is_ptr_operator(pc))
+   while (  pc->Is(CT_TYPE)
+         || pc->Is(CT_WORD)
+         || pc->Is(CT_QUALIFIER)
+         || pc->Is(CT_TYPENAME)
+         || pc->Is(CT_DC_MEMBER)
+         || pc->Is(CT_MEMBER)
+         || pc->Is(CT_PP)                       // Issue #3169
+         || pc->IsPointerOperator())
    {
       LOG_FMT(LFVD, "%s(%d):   1:pc->Text() '%s', type is %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
       cs.Push_Back(pc);
       pc = pc->GetNextNcNnl();
 
@@ -657,7 +658,7 @@ Chunk *fix_variable_definition(Chunk *start)
          return(Chunk::NullChunkPtr);
       }
       LOG_FMT(LFVD, "%s(%d):   2:pc->Text() '%s', type is %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
 
       // Skip templates and attributes
       pc = skip_template_next(pc);
@@ -668,7 +669,7 @@ Chunk *fix_variable_definition(Chunk *start)
          return(Chunk::NullChunkPtr);
       }
       LOG_FMT(LFVD, "%s(%d):   3:pc->Text() '%s', type is %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
 
       pc = skip_attribute_next(pc);
 
@@ -678,7 +679,7 @@ Chunk *fix_variable_definition(Chunk *start)
          return(Chunk::NullChunkPtr);
       }
       LOG_FMT(LFVD, "%s(%d):   4:pc->Text() '%s', type is %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
 
       if (language_is_set(LANG_JAVA))
       {
@@ -686,7 +687,7 @@ Chunk *fix_variable_definition(Chunk *start)
 
          if (pc->IsNotNullChunk())
          {
-            LOG_FMT(LFVD, "%s(%d):   5:pc->Text() '%s', type is %s\n", __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+            LOG_FMT(LFVD, "%s(%d):   5:pc->Text() '%s', type is %s\n", __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
          }
          else
          {
@@ -701,27 +702,27 @@ Chunk *fix_variable_definition(Chunk *start)
       LOG_FMT(LFVD, "%s(%d): end is null chunk\n", __func__, __LINE__);
       return(nullptr);
    }
-   LOG_FMT(LFVD, "%s(%d): end->type is %s\n", __func__, __LINE__, get_token_name(end->type));
+   LOG_FMT(LFVD, "%s(%d): end->GetType() is %s\n", __func__, __LINE__, get_token_name(end->GetType()));
 
-   if (chunk_is_token(end, CT_FUNC_CTOR_VAR))                // Issue #3010
+   if (end->Is(CT_FUNC_CTOR_VAR))                // Issue #3010
    {
       return(end);
    }
 
    if (  cs.Len() == 1
-      && chunk_is_token(end, CT_BRACE_OPEN)
-      && get_chunk_parent_type(end) == CT_BRACED_INIT_LIST)
+      && end->Is(CT_BRACE_OPEN)
+      && end->GetParentType() == CT_BRACED_INIT_LIST)
    {
-      set_chunk_type(cs.Get(0)->m_pc, CT_TYPE);
+      cs.Get(0)->m_pc->SetType(CT_TYPE);
    }
 
    // Function defs are handled elsewhere
    if (  (cs.Len() <= 1)
-      || chunk_is_token(end, CT_FUNC_DEF)
-      || chunk_is_token(end, CT_FUNC_PROTO)
-      || chunk_is_token(end, CT_FUNC_CLASS_DEF)
-      || chunk_is_token(end, CT_FUNC_CLASS_PROTO)
-      || chunk_is_token(end, CT_OPERATOR))
+      || end->Is(CT_FUNC_DEF)
+      || end->Is(CT_FUNC_PROTO)
+      || end->Is(CT_FUNC_CLASS_DEF)
+      || end->Is(CT_FUNC_CLASS_PROTO)
+      || end->Is(CT_OPERATOR))
    {
       return(skip_to_next_statement(end));
    }
@@ -730,8 +731,8 @@ Chunk *fix_variable_definition(Chunk *start)
 
    // Check for the '::' stuff: "char *Engine::name"
    if (  (cs.Len() >= 3)
-      && (  (cs.Get(cs.Len() - 2)->m_pc->type == CT_MEMBER)
-         || (cs.Get(cs.Len() - 2)->m_pc->type == CT_DC_MEMBER)))
+      && (  (cs.Get(cs.Len() - 2)->m_pc->GetType() == CT_MEMBER)
+         || (cs.Get(cs.Len() - 2)->m_pc->GetType() == CT_DC_MEMBER)))
    {
       idx = cs.Len() - 2;
 
@@ -739,16 +740,16 @@ Chunk *fix_variable_definition(Chunk *start)
       {
          tmp_pc = cs.Get(idx)->m_pc;
 
-         if (  chunk_is_not_token(tmp_pc, CT_DC_MEMBER)
-            && chunk_is_not_token(tmp_pc, CT_MEMBER))
+         if (  tmp_pc->IsNot(CT_DC_MEMBER)
+            && tmp_pc->IsNot(CT_MEMBER))
          {
             break;
          }
          idx--;
          tmp_pc = cs.Get(idx)->m_pc;
 
-         if (  chunk_is_not_token(tmp_pc, CT_WORD)
-            && chunk_is_not_token(tmp_pc, CT_TYPE))
+         if (  tmp_pc->IsNot(CT_WORD)
+            && tmp_pc->IsNot(CT_TYPE))
          {
             break;
          }
@@ -765,24 +766,24 @@ Chunk *fix_variable_definition(Chunk *start)
    {
       return(skip_to_next_statement(end));
    }
-   LOG_FMT(LFVD2, "%s(%d): orig_line is %zu, TYPE : ", __func__, __LINE__, start->orig_line);
+   LOG_FMT(LFVD2, "%s(%d): orig line is %zu, TYPE : ", __func__, __LINE__, start->GetOrigLine());
 
    for (size_t idxForCs = 0; idxForCs < cs.Len() - 1; idxForCs++)
    {
       tmp_pc = cs.Get(idxForCs)->m_pc;
       make_type(tmp_pc);
-      chunk_flags_set(tmp_pc, PCF_VAR_TYPE);
-      LOG_FMT(LFVD2, " Text() is '%s', type is %s", tmp_pc->Text(), get_token_name(tmp_pc->type));
+      tmp_pc->SetFlagBits(PCF_VAR_TYPE);
+      LOG_FMT(LFVD2, " Text() is '%s', type is %s", tmp_pc->Text(), get_token_name(tmp_pc->GetType()));
    }
 
    LOG_FMT(LFVD2, "\n");
 
    // OK we have two or more items, mark types up to the end.
-   LOG_FMT(LFVD, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col);
+   LOG_FMT(LFVD, "%s(%d): pc orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
    mark_variable_definition(cs.Get(cs.Len() - 1)->m_pc);
 
-   if (chunk_is_token(end, CT_COMMA))
+   if (end->Is(CT_COMMA))
    {
       return(end->GetNextNcNnl());
    }
@@ -801,25 +802,25 @@ void mark_cpp_constructor(Chunk *pc)
 
    tmp = pc->GetPrevNcNnlNi();   // Issue #2279
 
-   if (  chunk_is_token(tmp, CT_INV)
-      || chunk_is_token(tmp, CT_DESTRUCTOR))
+   if (  tmp->Is(CT_INV)
+      || tmp->Is(CT_DESTRUCTOR))
    {
-      set_chunk_type(tmp, CT_DESTRUCTOR);
-      set_chunk_parent(pc, CT_DESTRUCTOR);
+      tmp->SetType(CT_DESTRUCTOR);
+      pc->SetParentType(CT_DESTRUCTOR);
       is_destr = true;
    }
-   LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, FOUND %sSTRUCTOR for '%s'[%s] prev '%s'[%s]\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col,
+   LOG_FMT(LFTOR, "%s(%d): orig line is %zu, orig col is %zu, FOUND %sSTRUCTOR for '%s'[%s] prev '%s'[%s]\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(),
            is_destr ? "DE" : "CON",
-           pc->Text(), get_token_name(pc->type),
-           tmp->Text(), get_token_name(tmp->type));
+           pc->Text(), get_token_name(pc->GetType()),
+           tmp->Text(), get_token_name(tmp->GetType()));
 
    paren_open = skip_template_next(pc->GetNextNcNnl());
 
-   if (!chunk_is_str(paren_open, "("))
+   if (!paren_open->IsString("("))
    {
       LOG_FMT(LWARN, "%s:%zu Expected '(', got: [%s]\n",
-              cpd.filename.c_str(), paren_open->orig_line,
+              cpd.filename.c_str(), paren_open->GetOrigLine(),
               paren_open->Text());
       return;
    }
@@ -834,63 +835,63 @@ void mark_cpp_constructor(Chunk *pc)
    bool hit_colon = false;
 
    while (  tmp->IsNotNullChunk()
-         && (  chunk_is_not_token(tmp, CT_BRACE_OPEN)
-            || tmp->level != paren_open->level)
-         && !chunk_is_semicolon(tmp))
+         && (  tmp->IsNot(CT_BRACE_OPEN)
+            || tmp->GetLevel() != paren_open->GetLevel())
+         && !tmp->IsSemicolon())
    {
-      LOG_FMT(LFTOR, "%s(%d): tmp is '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col);
-      chunk_flags_set(tmp, PCF_IN_CONST_ARGS);
+      LOG_FMT(LFTOR, "%s(%d): tmp is '%s', orig line is %zu, orig col is %zu\n",
+              __func__, __LINE__, tmp->Text(), tmp->GetOrigLine(), tmp->GetOrigCol());
+      tmp->SetFlagBits(PCF_IN_CONST_ARGS);
       tmp = tmp->GetNextNcNnl();
 
-      if (  chunk_is_str(tmp, ":")
-         && tmp->level == paren_open->level)
+      if (  tmp->IsString(":")
+         && tmp->GetLevel() == paren_open->GetLevel())
       {
-         set_chunk_type(tmp, CT_CONSTR_COLON);
+         tmp->SetType(CT_CONSTR_COLON);
          hit_colon = true;
       }
 
       if (  hit_colon
-         && (  chunk_is_paren_open(tmp)
-            || chunk_is_opening_brace(tmp))
-         && tmp->level == paren_open->level)
+         && (  tmp->IsParenOpen()
+            || tmp->IsBraceOpen())
+         && tmp->GetLevel() == paren_open->GetLevel())
       {
          var = skip_template_prev(tmp->GetPrevNcNnlNi());   // Issue #2279
 
-         if (  chunk_is_token(var, CT_TYPE)
-            || chunk_is_token(var, CT_WORD))
+         if (  var->Is(CT_TYPE)
+            || var->Is(CT_WORD))
          {
-            set_chunk_type(var, CT_FUNC_CTOR_VAR);
+            var->SetType(CT_FUNC_CTOR_VAR);
             flag_parens(tmp, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CTOR_VAR, false);
          }
       }
    }
 
-   if (chunk_is_token(tmp, CT_BRACE_OPEN))
+   if (tmp->Is(CT_BRACE_OPEN))
    {
       set_paren_parent(paren_open, CT_FUNC_CLASS_DEF);
       set_paren_parent(tmp, CT_FUNC_CLASS_DEF);
-      LOG_FMT(LFCN, "%s(%d):  Marked '%s' as FUNC_CLASS_DEF on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+      LOG_FMT(LFCN, "%s(%d):  Marked '%s' as FUNC_CLASS_DEF on orig line %zu, orig col %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
    }
    else
    {
-      set_chunk_parent(tmp, CT_FUNC_CLASS_PROTO);
-      set_chunk_type(pc, CT_FUNC_CLASS_PROTO);
-      LOG_FMT(LFCN, "%s(%d):  Marked '%s' as FUNC_CLASS_PROTO on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+      tmp->SetParentType(CT_FUNC_CLASS_PROTO);
+      pc->SetType(CT_FUNC_CLASS_PROTO);
+      LOG_FMT(LFCN, "%s(%d):  Marked '%s' as FUNC_CLASS_PROTO on orig line %zu, orig col %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
    }
    tmp = pc->GetPrevNcNnlNi(); // Issue #2907
 
-   if (chunk_is_token(tmp, CT_DESTRUCTOR))
+   if (tmp->Is(CT_DESTRUCTOR))
    {
-      set_chunk_parent(tmp, pc->type);
+      tmp->SetParentType(pc->GetType());
       tmp = tmp->GetPrevNcNnlNi();
    }
 
-   while (chunk_is_token(tmp, CT_QUALIFIER))
+   while (tmp->Is(CT_QUALIFIER))
    {
-      set_chunk_parent(tmp, pc->type);
+      tmp->SetParentType(pc->GetType());
       tmp = tmp->GetPrevNcNnlNi();
    }
 } // mark_cpp_constructor
@@ -898,23 +899,23 @@ void mark_cpp_constructor(Chunk *pc)
 
 void mark_cpp_lambda(Chunk *square_open)
 {
-   if (  chunk_is_token(square_open, CT_SQUARE_OPEN)
-      && get_chunk_parent_type(square_open) == CT_CPP_LAMBDA)
+   if (  square_open->Is(CT_SQUARE_OPEN)
+      && square_open->GetParentType() == CT_CPP_LAMBDA)
    {
-      auto *brace_close = square_open->GetNextType(CT_BRACE_CLOSE, square_open->level);
+      auto *brace_close = square_open->GetNextType(CT_BRACE_CLOSE, square_open->GetLevel());
 
-      if (get_chunk_parent_type(brace_close) == CT_CPP_LAMBDA)
+      if (brace_close->GetParentType() == CT_CPP_LAMBDA)
       {
          for (auto *pc = square_open; pc != brace_close; pc = pc->GetNextNcNnl())
          {
-            chunk_flags_set(pc, PCF_IN_LAMBDA);
+            pc->SetFlagBits(PCF_IN_LAMBDA);
          }
       }
    }
 } // mark_cpp_lambda
 
 
-void mark_define_expressions(void)
+void mark_define_expressions()
 {
    LOG_FUNC_ENTRY();
 
@@ -927,9 +928,9 @@ void mark_define_expressions(void)
    {
       if (!in_define)
       {
-         if (  chunk_is_token(pc, CT_PP_DEFINE)
-            || chunk_is_token(pc, CT_PP_IF)
-            || chunk_is_token(pc, CT_PP_ELSE))
+         if (  pc->Is(CT_PP_DEFINE)
+            || pc->Is(CT_PP_IF)
+            || pc->Is(CT_PP_ELSE))
          {
             in_define = true;
             first     = true;
@@ -937,33 +938,33 @@ void mark_define_expressions(void)
       }
       else
       {
-         if (  !pc->flags.test(PCF_IN_PREPROC)
-            || chunk_is_token(pc, CT_PREPROC))
+         if (  !pc->TestFlags(PCF_IN_PREPROC)
+            || pc->Is(CT_PREPROC))
          {
             in_define = false;
          }
          else
          {
-            if (  chunk_is_not_token(pc, CT_MACRO)
+            if (  pc->IsNot(CT_MACRO)
                && (  first
-                  || chunk_is_token(prev, CT_PAREN_OPEN)
-                  || chunk_is_token(prev, CT_ARITH)
-                  || chunk_is_token(prev, CT_SHIFT)
-                  || chunk_is_token(prev, CT_CARET)
-                  || chunk_is_token(prev, CT_ASSIGN)
-                  || chunk_is_token(prev, CT_COMPARE)
-                  || chunk_is_token(prev, CT_RETURN)
-                  || chunk_is_token(prev, CT_GOTO)
-                  || chunk_is_token(prev, CT_CONTINUE)
-                  || chunk_is_token(prev, CT_FPAREN_OPEN)
-                  || chunk_is_token(prev, CT_SPAREN_OPEN)
-                  || chunk_is_token(prev, CT_BRACE_OPEN)
-                  || chunk_is_semicolon(prev)
-                  || chunk_is_token(prev, CT_COMMA)
-                  || chunk_is_token(prev, CT_COLON)
-                  || chunk_is_token(prev, CT_QUESTION)))
+                  || prev->Is(CT_PAREN_OPEN)
+                  || prev->Is(CT_ARITH)
+                  || prev->Is(CT_SHIFT)
+                  || prev->Is(CT_CARET)
+                  || prev->Is(CT_ASSIGN)
+                  || prev->Is(CT_COMPARE)
+                  || prev->Is(CT_RETURN)
+                  || prev->Is(CT_GOTO)
+                  || prev->Is(CT_CONTINUE)
+                  || prev->Is(CT_FPAREN_OPEN)
+                  || prev->Is(CT_SPAREN_OPEN)
+                  || prev->Is(CT_BRACE_OPEN)
+                  || prev->IsSemicolon()
+                  || prev->Is(CT_COMMA)
+                  || prev->Is(CT_COLON)
+                  || prev->Is(CT_QUESTION)))
             {
-               chunk_flags_set(pc, PCF_EXPR_START);
+               pc->SetFlagBits(PCF_EXPR_START);
                first = false;
             }
          }
@@ -980,33 +981,33 @@ void mark_exec_sql(Chunk *pc)
    Chunk *tmp;
 
    // Change CT_WORD to CT_SQL_WORD
-   for (tmp = pc->GetNext(); tmp != nullptr && tmp->IsNotNullChunk(); tmp = tmp->GetNext())
+   for (tmp = pc->GetNext(); tmp->IsNotNullChunk(); tmp = tmp->GetNext())
    {
-      set_chunk_parent(tmp, pc->type);
+      tmp->SetParentType(pc->GetType());
 
-      if (chunk_is_token(tmp, CT_WORD))
+      if (tmp->Is(CT_WORD))
       {
-         set_chunk_type(tmp, CT_SQL_WORD);
+         tmp->SetType(CT_SQL_WORD);
       }
 
-      if (chunk_is_token(tmp, CT_SEMICOLON))
+      if (tmp->Is(CT_SEMICOLON))
       {
          break;
       }
    }
 
-   if (  chunk_is_not_token(pc, CT_SQL_BEGIN)
+   if (  pc->IsNot(CT_SQL_BEGIN)
       || tmp->IsNullChunk()
-      || chunk_is_not_token(tmp, CT_SEMICOLON))
+      || tmp->IsNot(CT_SEMICOLON))
    {
       return;
    }
 
    for (tmp = tmp->GetNext();
-        tmp->IsNotNullChunk() && chunk_is_not_token(tmp, CT_SQL_END);
+        tmp->IsNotNullChunk() && tmp->IsNot(CT_SQL_END);
         tmp = tmp->GetNext())
    {
-      tmp->level++;
+      tmp->SetLevel(tmp->GetLevel() + 1);
    }
 } // mark_exec_sql
 
@@ -1016,26 +1017,27 @@ void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type)
    LOG_FUNC_ENTRY();
    Chunk *pc = start;
 
-   if (pc != nullptr)
+   if (  pc != nullptr
+      && 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",
-              __func__, __LINE__, fname->Text(), fname->orig_line, fname->orig_col);
+      LOG_FMT(LFCNR, "%s(%d): (backwards) return type for '%s' @ orig line is %zu, orig col is %zu\n",
+              __func__, __LINE__, fname->Text(), fname->GetOrigLine(), fname->GetOrigCol());
 
       Chunk *first = pc;
 
       while (pc->IsNotNullChunk())
       {
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s, ",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
-         log_pcf_flags(LFCNR, pc->flags);
+         LOG_FMT(LFCNR, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s, ",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
+         log_pcf_flags(LFCNR, pc->GetFlags());
 
-         if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+         if (pc->Is(CT_ANGLE_CLOSE))
          {
             pc = skip_template_prev(pc);
 
             if (  pc->IsNullChunk()
-               || chunk_is_token(pc, CT_TEMPLATE))
+               || pc->Is(CT_TEMPLATE))
             {
                //either expression is not complete or this is smth like 'template<T> void func()'
                //  - we are not interested in 'template<T>' part
@@ -1047,16 +1049,16 @@ void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type)
             }
          }
 
-         if (  (  !chunk_is_type(pc)
-               && chunk_is_not_token(pc, CT_OPERATOR)
-               && chunk_is_not_token(pc, CT_WORD)
-               && chunk_is_not_token(pc, CT_ADDR))
-            || pc->flags.test(PCF_IN_PREPROC))
+         if (  (  !pc->IsTypeDefinition()
+               && pc->IsNot(CT_OPERATOR)
+               && pc->IsNot(CT_WORD)
+               && pc->IsNot(CT_ADDR))
+            || pc->TestFlags(PCF_IN_PREPROC))
          {
             break;
          }
 
-         if (!chunk_is_ptr_operator(pc))
+         if (!pc->IsPointerOperator())
          {
             first = pc;
          }
@@ -1067,28 +1069,28 @@ void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type)
       // Changing words to types into tuple return types in CS.
       bool is_return_tuple = false;
 
-      if (  chunk_is_token(pc, CT_PAREN_CLOSE)
-         && !pc->flags.test(PCF_IN_PREPROC))
+      if (  pc->Is(CT_PAREN_CLOSE)
+         && !pc->TestFlags(PCF_IN_PREPROC))
       {
-         first           = chunk_skip_to_match_rev(pc);
+         first           = pc->GetOpeningParen();
          is_return_tuple = true;
       }
       pc = first;
 
       while (pc->IsNotNullChunk())
       {
-         LOG_FMT(LFCNR, " Text() '%s', type is %s", pc->Text(), get_token_name(pc->type));
+         LOG_CHUNK(LTOK, pc);
 
          if (parent_type != CT_NONE)
          {
-            set_chunk_parent(pc, parent_type);
+            pc->SetParentType(parent_type);
          }
          Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
 
          if (  !is_return_tuple
-            || chunk_is_not_token(pc, CT_WORD)
+            || pc->IsNot(CT_WORD)
             || (  prev->IsNullChunk()
-               && chunk_is_not_token(prev, CT_TYPE)))
+               && prev->IsNot(CT_TYPE)))
          {
             make_type(pc);
          }
@@ -1100,9 +1102,9 @@ void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type)
          pc = pc->GetNextNcNnl();
 
          //template angles should keep parent type CT_TEMPLATE
-         if (chunk_is_token(pc, CT_ANGLE_OPEN))
+         if (pc->Is(CT_ANGLE_OPEN))
          {
-            pc = pc->GetNextType(CT_ANGLE_CLOSE, pc->level);
+            pc = pc->GetNextType(CT_ANGLE_CLOSE, pc->GetLevel());
 
             if (pc == start)
             {
@@ -1116,28 +1118,28 @@ void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type)
       // Back up and mark parent type on friend declarations
       if (  parent_type != CT_NONE
          && first
-         && first->flags.test(PCF_IN_CLASS))
+         && first->TestFlags(PCF_IN_CLASS))
       {
          pc = first->GetPrevNcNnlNi();   // Issue #2279
 
-         if (chunk_is_token(pc, CT_FRIEND))
+         if (pc->Is(CT_FRIEND))
          {
             LOG_FMT(LFCNR, "%s(%d): marking friend\n", __func__, __LINE__);
-            set_chunk_parent(pc, parent_type);
+            pc->SetParentType(parent_type);
             // A friend might be preceded by a template specification, as in:
             //   template <...> friend type func(...);
             // If so, we need to mark that also
             pc = pc->GetPrevNcNnlNi();   // Issue #2279
 
-            if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+            if (pc->Is(CT_ANGLE_CLOSE))
             {
                pc = skip_template_prev(pc);
 
-               if (chunk_is_token(pc, CT_TEMPLATE))
+               if (pc->Is(CT_TEMPLATE))
                {
                   LOG_FMT(LFCNR, "%s(%d): marking friend template\n",
                           __func__, __LINE__);
-                  set_chunk_parent(pc, parent_type);
+                  pc->SetParentType(parent_type);
                }
             }
          }
@@ -1154,8 +1156,8 @@ void mark_function(Chunk *pc)
    {
       return;
    }
-   LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+   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();
 
@@ -1169,19 +1171,19 @@ void mark_function(Chunk *pc)
    Chunk *paren_close;
 
    // Find out what is before the operator
-   if (get_chunk_parent_type(pc) == CT_OPERATOR)
+   if (pc->GetParentType() == CT_OPERATOR)
    {
-      LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-      log_pcf_flags(LGUY, pc->flags);
-      Chunk *pc_op = pc->GetPrevType(CT_OPERATOR, pc->level);
+      LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+      log_pcf_flags(LGUY, pc->GetFlags());
+      Chunk *pc_op = pc->GetPrevType(CT_OPERATOR, pc->GetLevel());
 
       if (  pc_op->IsNotNullChunk()
-         && pc_op->flags.test(PCF_EXPR_START))
+         && 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",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-         set_chunk_type(pc, CT_FUNC_CALL);
+         LOG_FMT(LFCN, "%s(%d): (4) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+         pc->SetType(CT_FUNC_CALL);
       }
 
       if (language_is_set(LANG_CPP))
@@ -1190,62 +1192,62 @@ void mark_function(Chunk *pc)
 
          while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
          {
-            if (  chunk_is_token(tmp, CT_BRACE_CLOSE)
-               || chunk_is_token(tmp, CT_BRACE_OPEN)             // Issue 575
-               || chunk_is_token(tmp, CT_SEMICOLON))
+            if (  tmp->Is(CT_BRACE_CLOSE)
+               || tmp->Is(CT_BRACE_OPEN)             // Issue 575
+               || tmp->Is(CT_SEMICOLON))
             {
                break;
             }
 
-            if (  chunk_is_paren_open(tmp)
-               && !pc->flags.test(PCF_IN_PREPROC))               // Issue #2703
+            if (  tmp->IsParenOpen()
+               && !pc->TestFlags(PCF_IN_PREPROC))               // Issue #2703
             {
-               LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
-               LOG_FMT(LFCN, "%s(%d): (5) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-               set_chunk_type(pc, CT_FUNC_CALL);
+               LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+                       __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
+               LOG_FMT(LFCN, "%s(%d): (5) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+               pc->SetType(CT_FUNC_CALL);
                break;
             }
 
-            if (chunk_is_token(tmp, CT_ASSIGN))
+            if (tmp->Is(CT_ASSIGN))
             {
-               LOG_FMT(LFCN, "%s(%d): (6) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-               set_chunk_type(pc, CT_FUNC_CALL);
+               LOG_FMT(LFCN, "%s(%d): (6) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+               pc->SetType(CT_FUNC_CALL);
                break;
             }
 
-            if (chunk_is_token(tmp, CT_TEMPLATE))
+            if (tmp->Is(CT_TEMPLATE))
             {
-               LOG_FMT(LFCN, "%s(%d): (7) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-               set_chunk_type(pc, CT_FUNC_DEF);
+               LOG_FMT(LFCN, "%s(%d): (7) SET TO CT_FUNC_DEF: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+               pc->SetType(CT_FUNC_DEF);
                break;
             }
 
-            if (chunk_is_token(tmp, CT_BRACE_OPEN))
+            if (tmp->Is(CT_BRACE_OPEN))
             {
-               if (get_chunk_parent_type(tmp) == CT_FUNC_DEF)
+               if (tmp->GetParentType() == CT_FUNC_DEF)
                {
-                  LOG_FMT(LFCN, "%s(%d): (8) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-                  set_chunk_type(pc, CT_FUNC_CALL);
+                  LOG_FMT(LFCN, "%s(%d): (8) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+                  pc->SetType(CT_FUNC_CALL);
                }
 
-               if (  get_chunk_parent_type(tmp) == CT_CLASS
-                  || get_chunk_parent_type(tmp) == CT_STRUCT)
+               if (  tmp->GetParentType() == CT_CLASS
+                  || tmp->GetParentType() == CT_STRUCT)
                {
-                  LOG_FMT(LFCN, "%s(%d): (9) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-                  set_chunk_type(pc, CT_FUNC_DEF);
+                  LOG_FMT(LFCN, "%s(%d): (9) SET TO CT_FUNC_DEF: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+                  pc->SetType(CT_FUNC_DEF);
                }
                break;
             }
          }
 
          if (  tmp != nullptr
-            && chunk_is_not_token(pc, CT_FUNC_CALL))
+            && pc->IsNot(CT_FUNC_CALL))
          {
             // Mark the return type
             tmp = tmp->GetNextNcNnl();
@@ -1260,8 +1262,8 @@ void mark_function(Chunk *pc)
       }
    }
 
-   if (  chunk_is_ptr_operator(next)
-      || chunk_is_newline(next))
+   if (  next->IsPointerOperator()
+      || next->IsNewline())
    {
       next = next->GetNextNppOrNcNnl();
 
@@ -1270,25 +1272,25 @@ void mark_function(Chunk *pc)
          return;
       }
    }
-   LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s, type is %s, parent_type is %s\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
-   LOG_FMT(LFCN, "   level is %zu, brace_level is %zu, next->Text() '%s', next->type is %s, next->level is %zu\n",
-           pc->level, pc->brace_level,
-           next->Text(), get_token_name(next->type), next->level);
+   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__, 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",
+           pc->GetLevel(), pc->GetBraceLevel(),
+           next->Text(), get_token_name(next->GetType()), next->GetLevel());
 
-   if (pc->flags.test(PCF_IN_CONST_ARGS))
+   if (pc->TestFlags(PCF_IN_CONST_ARGS))
    {
-      set_chunk_type(pc, CT_FUNC_CTOR_VAR);
+      pc->SetType(CT_FUNC_CTOR_VAR);
       LOG_FMT(LFCN, "%s(%d):   1) Marked [%s] as FUNC_CTOR_VAR on line %zu col %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
       next = skip_template_next(next);
 
       if (next == nullptr)
       {
          return;
       }
-      flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, pc->type, true);
+      flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, pc->GetType(), true);
       return;
    }
    // Skip over any template and attribute madness
@@ -1305,30 +1307,32 @@ void mark_function(Chunk *pc)
       return;
    }
    // Find the open and close parenthesis
-   paren_open  = pc->GetNextString("(", 1, pc->level);
-   paren_close = paren_open->GetNextString(")", 1, pc->level);
+   paren_open  = pc->GetNextString("(", 1, pc->GetLevel());
+   paren_close = paren_open->GetNextString(")", 1, pc->GetLevel());
 
    if (  paren_open->IsNullChunk()
       || paren_close->IsNullChunk())
    {
-      LOG_FMT(LFCN, "%s(%d): No parens found for [%s] on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+      LOG_FMT(LFCN, "%s(%d): No parens found for [%s] on orig line %zu, orig col %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
       return;
    }
    /*
     * This part detects either chained function calls or a function ptr definition.
     * MYTYPE (*func)(void);
+    * MYTYPE (*func(param))(void);
+    * MYTYPE (*func(param_call1)(param_call2))(void);
     * mWriter( "class Clst_"c )( somestr.getText() )( " : Cluster {"c ).newline;
     *
     * For it to be a function variable def, there must be a '*' followed by a
-    * single word.
+    * single word or by a sequence of one or more expressions each within brackets.
     *
     * Otherwise, it must be chained function calls.
     */
    tmp = paren_close->GetNextNcNnl();
 
    if (  tmp->IsNotNullChunk()
-      && chunk_is_str(tmp, "("))
+      && tmp->IsString("("))
    {
       Chunk *tmp1;
       Chunk *tmp2;
@@ -1341,8 +1345,8 @@ void mark_function(Chunk *pc)
       {
          tmp2 = tmp1->GetNextNcNnl();
 
-         if (  !chunk_is_word(tmp1)
-            || chunk_is_not_token(tmp2, CT_DC_MEMBER))
+         if (  !tmp1->IsWord()
+            || tmp2->IsNot(CT_DC_MEMBER))
          {
             break;
          }
@@ -1350,7 +1354,7 @@ void mark_function(Chunk *pc)
       }
       tmp2 = tmp1->GetNextNcNnl();
 
-      if (chunk_is_str(tmp2, ")"))
+      if (tmp2->IsString(")"))
       {
          tmp3 = tmp2;
          tmp2 = Chunk::NullChunkPtr;
@@ -1359,84 +1363,92 @@ void mark_function(Chunk *pc)
       {
          tmp3 = tmp2->GetNextNcNnl();
       }
-      tmp3 = chunk_get_next_ssq(tmp3);
+      tmp3 = tmp3->GetNextNbsb();
 
-      if (  chunk_is_str(tmp3, ")")
+      // Issue #3852
+      while (tmp3->IsString("("))
+      {
+         tmp3 = tmp3->GetClosingParen();
+         tmp3 = tmp3->GetNextNcNnl();
+      }
+
+      if (  tmp3->IsString(")")
          && (  tmp1->IsStar()
-            || chunk_is_msref(tmp1)
+            || tmp1->IsMsRef()
             || (  language_is_set(LANG_OC)
-               && chunk_is_token(tmp1, CT_CARET)))
+               && tmp1->Is(CT_CARET)))
          && (  tmp2->IsNullChunk()
-            || chunk_is_token(tmp2, CT_WORD)))
+            || tmp2->Is(CT_WORD)))
       {
          if (tmp2->IsNotNullChunk())
          {
-            LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, function variable '%s', changing '%s' into a type\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, tmp2->Text(), pc->Text());
-            set_chunk_type(tmp2, CT_FUNC_VAR);
+            LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, function variable '%s', changing '%s' into a type\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), tmp2->Text(), pc->Text());
+            tmp2->SetType(CT_FUNC_VAR);
             flag_parens(paren_open, PCF_NONE, CT_PAREN_OPEN, CT_FUNC_VAR, false);
 
-            LOG_FMT(LFCN, "%s(%d): paren open @ orig_line %zu, orig_col %zu\n",
-                    __func__, __LINE__, paren_open->orig_line, paren_open->orig_col);
+            LOG_FMT(LFCN, "%s(%d): paren open @ orig line %zu, orig col %zu\n",
+                    __func__, __LINE__, paren_open->GetOrigLine(), paren_open->GetOrigCol());
          }
          else
          {
-            LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, function type, changing '%s' into a type\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+            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)
             {
-               set_chunk_type(tmp2, CT_FUNC_TYPE);
+               tmp2->SetType(CT_FUNC_TYPE);
             }
             flag_parens(paren_open, PCF_NONE, CT_PAREN_OPEN, CT_FUNC_TYPE, false);
          }
-         set_chunk_type(pc, CT_TYPE);
-         set_chunk_type(tmp1, CT_PTR_TYPE);
-         chunk_flags_clr(pc, PCF_VAR_1ST_DEF);
+         pc->SetType(CT_TYPE);
+         tmp1->SetType(CT_PTR_TYPE);
+         pc->ResetFlagBits(PCF_VAR_1ST_DEF);
 
          if (tmp2->IsNotNullChunk())
          {
-            chunk_flags_set(tmp2, PCF_VAR_1ST_DEF);
+            tmp2->SetFlagBits(PCF_VAR_1ST_DEF);
          }
          flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, CT_FUNC_PROTO, false);
          fix_fcn_def_params(tmp);
          return;
       }
-      LOG_FMT(LFCN, "%s(%d): chained function calls? Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+      LOG_FMT(LFCN, "%s(%d): chained function calls? Text() is '%s', orig line is %zu, orig col is %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
    }
 
    // Assume it is a function call if not already labeled
-   if (chunk_is_token(pc, CT_FUNCTION))
+   if (pc->Is(CT_FUNCTION))
    {
-      LOG_FMT(LFCN, "%s(%d): examine: Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-      // look for an assigment. Issue #575
-      Chunk *temp = pc->GetNextType(CT_ASSIGN, pc->level);
+      LOG_FMT(LFCN, "%s(%d): examine: 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()));
+      // look for an assignment. Issue #575
+      Chunk *temp = pc->GetNextType(CT_ASSIGN, pc->GetLevel());
 
       if (temp->IsNotNullChunk())
       {
-         LOG_FMT(LFCN, "%s(%d): assigment found, orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, temp->orig_line, temp->orig_col, temp->Text());
-         LOG_FMT(LFCN, "%s(%d): (10) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-         set_chunk_type(pc, CT_FUNC_CALL);
+         LOG_FMT(LFCN, "%s(%d): assignment found, orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, temp->GetOrigLine(), temp->GetOrigCol(), temp->Text());
+         LOG_FMT(LFCN, "%s(%d): (10) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+         pc->SetType(CT_FUNC_CALL);
       }
       else
       {
-         LOG_FMT(LFCN, "%s(%d): (11) SET TO %s: orig_line is %zu, orig_col is %zu, Text() '%s'",
-                 __func__, __LINE__, (get_chunk_parent_type(pc) == CT_OPERATOR) ? "CT_FUNC_DEF" : "CT_FUNC_CALL",
-                 pc->orig_line, pc->orig_col, pc->Text());
-         set_chunk_type(pc, (get_chunk_parent_type(pc) == CT_OPERATOR) ? CT_FUNC_DEF : CT_FUNC_CALL);
+         LOG_FMT(LFCN, "%s(%d): (11) SET TO %s: orig line is %zu, orig col is %zu, Text() '%s'",
+                 __func__, __LINE__, (pc->GetParentType() == CT_OPERATOR) ? "CT_FUNC_DEF" : "CT_FUNC_CALL",
+                 pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+         pc->SetType((pc->GetParentType() == CT_OPERATOR) ? CT_FUNC_DEF : CT_FUNC_CALL);
       }
    }
-   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->orig_line, pc->orig_col, get_token_name(pc->type));
+   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)
+   if (  prev != nullptr
+      && 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->orig_line, prev->orig_col, get_token_name(prev->type));
+      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
    {
@@ -1444,59 +1456,59 @@ void mark_function(Chunk *pc)
    }
 
    // Check for C++ function def
-   if (  chunk_is_token(pc, CT_FUNC_CLASS_DEF)
+   if (  pc->Is(CT_FUNC_CLASS_DEF)
       || (  prev->IsNotNullChunk()
-         && (  chunk_is_token(prev, CT_INV)
-            || chunk_is_token(prev, CT_DC_MEMBER))))
+         && (  prev->Is(CT_INV)
+            || prev->Is(CT_DC_MEMBER))))
    {
       Chunk *destr = Chunk::NullChunkPtr;
 
-      if (chunk_is_token(prev, CT_INV))
+      if (prev->Is(CT_INV))
       {
          // TODO: do we care that this is the destructor?
-         set_chunk_type(prev, CT_DESTRUCTOR);
-         set_chunk_type(pc, CT_FUNC_CLASS_DEF);
+         prev->SetType(CT_DESTRUCTOR);
+         pc->SetType(CT_FUNC_CLASS_DEF);
 
-         set_chunk_parent(pc, CT_DESTRUCTOR);
+         pc->SetParentType(CT_DESTRUCTOR);
 
          destr = prev;
          // Point to the item previous to the class name
          prev = prev->GetPrevNcNnlNpp();
       }
 
-      if (chunk_is_token(prev, CT_DC_MEMBER))
+      if (prev->Is(CT_DC_MEMBER))
       {
          prev = prev->GetPrevNcNnlNpp();
 
          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->orig_line, prev->orig_col,
-                    get_token_name(prev->type));
+            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()));
             prev = skip_template_prev(prev);
-            LOG_FMT(LFCN, "%s(%d): prev->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                    __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col,
-                    get_token_name(prev->type));
+            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()));
             prev = skip_attribute_prev(prev);
-            LOG_FMT(LFCN, "%s(%d): prev->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                    __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col,
-                    get_token_name(prev->type));
+            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()));
          }
 
-         if (  chunk_is_token(prev, CT_WORD)
-            || chunk_is_token(prev, CT_TYPE))
+         if (  prev->Is(CT_WORD)
+            || prev->Is(CT_TYPE))
          {
-            if (pc->str.equals(prev->str))
+            if (pc->GetStr().equals(prev->GetStr()))
             {
-               LOG_FMT(LFCN, "%s(%d): pc->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col,
-                       get_token_name(prev->type));
-               set_chunk_type(pc, CT_FUNC_CLASS_DEF);
-               LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu - FOUND %sSTRUCTOR for '%s', type is %s\n",
+               LOG_FMT(LFCN, "%s(%d): pc->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(prev->GetType()));
+               pc->SetType(CT_FUNC_CLASS_DEF);
+               LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu - FOUND %sSTRUCTOR for '%s', type is %s\n",
                        __func__, __LINE__,
-                       prev->orig_line, prev->orig_col,
+                       prev->GetOrigLine(), prev->GetOrigCol(),
                        (destr->IsNotNullChunk()) ? "DE" : "CON",
-                       prev->Text(), get_token_name(prev->type));
+                       prev->Text(), get_token_name(prev->GetType()));
 
                mark_cpp_constructor(pc);
                return;
@@ -1512,16 +1524,16 @@ void mark_function(Chunk *pc)
     * We check for level==1 to allow the case that a function prototype is
     * wrapped in a macro: "MACRO(void foo(void));"
     */
-   if (  chunk_is_token(pc, CT_FUNC_CALL)
-      && (  pc->level == pc->brace_level
-         || pc->level == 1)
-      && !pc->flags.test(PCF_IN_ARRAY_ASSIGN))
+   if (  pc->Is(CT_FUNC_CALL)
+      && (  pc->GetLevel() == pc->GetBraceLevel()
+         || pc->GetLevel() == 1)
+      && !pc->TestFlags(PCF_IN_ARRAY_ASSIGN))
    {
       bool isa_def  = false;
       bool hit_star = false;
-      LOG_FMT(LFCN, "%s(%d): pc->Text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col,
-              get_token_name(pc->type));
+      LOG_FMT(LFCN, "%s(%d): pc->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->IsNullChunk())
       {
@@ -1530,8 +1542,8 @@ void mark_function(Chunk *pc)
       }
       else
       {
-         LOG_FMT(LFCN, "%s(%d): Checking func call: prev->Text() '%s', prev->type is %s\n",
-                 __func__, __LINE__, prev->Text(), get_token_name(prev->type));
+         LOG_FMT(LFCN, "%s(%d): Checking func call: prev->Text() '%s', prev->GetType() is %s\n",
+                 __func__, __LINE__, prev->Text(), get_token_name(prev->GetType()));
       }
       // if (!chunk_ends_type(prev))
       // {
@@ -1558,31 +1570,31 @@ void mark_function(Chunk *pc)
        */
       while (prev->IsNotNullChunk())
       {
-         LOG_FMT(LFCN, "%s(%d): next step with: prev->orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text());
+         LOG_FMT(LFCN, "%s(%d): next step with: prev orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text());
 
-         if (get_chunk_parent_type(pc) == CT_FIXED)
+         if (pc->GetParentType() == CT_FIXED)
          {
             isa_def = true;
          }
 
-         if (prev->flags.test(PCF_IN_PREPROC))
+         if (prev->TestFlags(PCF_IN_PREPROC))
          {
             prev = prev->GetPrevNcNnlNpp();
             continue;
          }
 
          // Some code slips an attribute between the type and function
-         if (  chunk_is_token(prev, CT_FPAREN_CLOSE)
-            && get_chunk_parent_type(prev) == CT_ATTRIBUTE)
+         if (  prev->Is(CT_FPAREN_CLOSE)
+            && prev->GetParentType() == CT_ATTRIBUTE)
          {
             prev = skip_attribute_prev(prev);
             continue;
          }
 
          // skip const(TYPE)
-         if (  chunk_is_token(prev, CT_PAREN_CLOSE)
-            && get_chunk_parent_type(prev) == CT_D_CAST)
+         if (  prev->Is(CT_PAREN_CLOSE)
+            && prev->GetParentType() == CT_D_CAST)
          {
             LOG_FMT(LFCN, "%s(%d): --> For sure a prototype or definition\n",
                     __func__, __LINE__);
@@ -1590,19 +1602,18 @@ void mark_function(Chunk *pc)
             break;
          }
 
-         if (get_chunk_parent_type(prev) == CT_DECLSPEC)  // Issue 1289
+         if (prev->GetParentType() == CT_DECLSPEC)  // Issue 1289
          {
-            prev = chunk_skip_to_match_rev(prev);
+            prev = prev->GetOpeningParen();
 
-            if (prev != nullptr)
+            if (prev->IsNotNullChunk())
             {
                prev = prev->GetPrev();
             }
 
-            if (chunk_is_token(prev, CT_DECLSPEC))
+            if (prev->Is(CT_DECLSPEC))
             {
-               if (  prev != nullptr
-                  && prev->IsNotNullChunk())
+               if (prev->IsNotNullChunk())
                {
                   prev = prev->GetPrev();
                }
@@ -1613,27 +1624,27 @@ void mark_function(Chunk *pc)
          // but one of the preceding tokens is a CT_MEMBER than this is not a
          // fcn def, issue #1466
          if (  isa_def
-            && chunk_is_token(prev, CT_MEMBER))
+            && prev->Is(CT_MEMBER))
          {
             isa_def = false;
          }
 
          // get first chunk before: A::B::pc | this.B.pc | this->B->pc
-         if (  chunk_is_token(prev, CT_DC_MEMBER)
-            || chunk_is_token(prev, CT_MEMBER))
+         if (  prev->Is(CT_DC_MEMBER)
+            || prev->Is(CT_MEMBER))
          {
-            while (  chunk_is_token(prev, CT_DC_MEMBER)
-                  || chunk_is_token(prev, CT_MEMBER))
+            while (  prev->Is(CT_DC_MEMBER)
+                  || prev->Is(CT_MEMBER))
             {
                prev = prev->GetPrevNcNnlNpp();
 
                if (  prev->IsNullChunk()
-                  || (  chunk_is_not_token(prev, CT_WORD)
-                     && chunk_is_not_token(prev, CT_TYPE)
-                     && chunk_is_not_token(prev, CT_THIS)))
+                  || (  prev->IsNot(CT_WORD)
+                     && prev->IsNot(CT_TYPE)
+                     && prev->IsNot(CT_THIS)))
                {
                   LOG_FMT(LFCN, "%s(%d): --? skipped MEMBER and landed on %s\n",
-                          __func__, __LINE__, (prev->IsNullChunk()) ? "<null chunk>" : get_token_name(prev->type));
+                          __func__, __LINE__, (prev->IsNullChunk()) ? "<null chunk>" : get_token_name(prev->GetType()));
                   break;
                }
                LOG_FMT(LFCN, "%s(%d): <skip> '%s'\n",
@@ -1652,8 +1663,8 @@ void mark_function(Chunk *pc)
                }
                else
                {
-                  LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                          __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text());
+                  LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+                          __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text());
                }
             }
 
@@ -1664,8 +1675,8 @@ void mark_function(Chunk *pc)
          }
 
          // If we are on a TYPE or WORD, then this could be a proto or def
-         if (  chunk_is_token(prev, CT_TYPE)
-            || chunk_is_token(prev, CT_WORD))
+         if (  prev->Is(CT_TYPE)
+            || prev->Is(CT_WORD))
          {
             if (!hit_star)
             {
@@ -1676,46 +1687,46 @@ void mark_function(Chunk *pc)
             }
             Chunk *prev_prev = prev->GetPrevNcNnlNpp();
 
-            if (!chunk_is_token(prev_prev, CT_QUESTION))               // Issue #1753
+            if (!prev_prev->Is(CT_QUESTION))               // Issue #1753
             {
                LOG_FMT(LFCN, "%s(%d):   --> maybe a proto/def\n",
                        __func__, __LINE__);
 
-               LOG_FMT(LFCN, "%s(%d): prev is '%s', orig_line is %zu, orig_col is %zu, type is %s, parent_type is %s\n",
-                       __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col,
-                       get_token_name(prev->type), get_token_name(get_chunk_parent_type(prev)));
-               log_pcf_flags(LFCN, pc->flags);
+               LOG_FMT(LFCN, "%s(%d): prev is '%s', orig line is %zu, orig col is %zu, type is %s, parent type is %s\n",
+                       __func__, __LINE__, prev->Text(), prev->GetOrigLine(), prev->GetOrigCol(),
+                       get_token_name(prev->GetType()), get_token_name(prev->GetParentType()));
+               log_pcf_flags(LFCN, pc->GetFlags());
                isa_def = true;
             }
          }
 
-         if (chunk_is_ptr_operator(prev))
+         if (prev->IsPointerOperator())
          {
             hit_star = true;
          }
 
-         if (  chunk_is_not_token(prev, CT_OPERATOR)
-            && chunk_is_not_token(prev, CT_TSQUARE)
-            && chunk_is_not_token(prev, CT_ANGLE_CLOSE)
-            && chunk_is_not_token(prev, CT_QUALIFIER)
-            && chunk_is_not_token(prev, CT_TYPE)
-            && chunk_is_not_token(prev, CT_WORD)
-            && !chunk_is_ptr_operator(prev))
+         if (  prev->IsNot(CT_OPERATOR)
+            && prev->IsNot(CT_TSQUARE)
+            && prev->IsNot(CT_ANGLE_CLOSE)
+            && prev->IsNot(CT_QUALIFIER)
+            && prev->IsNot(CT_TYPE)
+            && prev->IsNot(CT_WORD)
+            && !prev->IsPointerOperator())
          {
-            LOG_FMT(LFCN, "%s(%d):  --> Stopping on prev is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                    __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col, get_token_name(prev->type));
+            LOG_FMT(LFCN, "%s(%d):  --> Stopping on prev 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()));
 
             // certain tokens are unlikely to precede a prototype or definition
-            if (  chunk_is_token(prev, CT_ARITH)
-               || chunk_is_token(prev, CT_SHIFT)
-               || chunk_is_token(prev, CT_ASSIGN)
-               || chunk_is_token(prev, CT_COMMA)
-               || (  chunk_is_token(prev, CT_STRING)
-                  && get_chunk_parent_type(prev) != CT_EXTERN)  // fixes issue 1259
-               || chunk_is_token(prev, CT_STRING_MULTI)
-               || chunk_is_token(prev, CT_NUMBER)
-               || chunk_is_token(prev, CT_NUMBER_FP)
-               || chunk_is_token(prev, CT_FPAREN_OPEN)) // issue #1464
+            if (  prev->Is(CT_ARITH)
+               || prev->Is(CT_SHIFT)
+               || prev->Is(CT_ASSIGN)
+               || prev->Is(CT_COMMA)
+               || (  prev->Is(CT_STRING)
+                  && prev->GetParentType() != CT_EXTERN)  // fixes issue 1259
+               || prev->Is(CT_STRING_MULTI)
+               || prev->Is(CT_NUMBER)
+               || prev->Is(CT_NUMBER_FP)
+               || prev->Is(CT_FPAREN_OPEN)) // issue #1464
             {
                isa_def = false;
             }
@@ -1723,7 +1734,7 @@ void mark_function(Chunk *pc)
          }
 
          // Skip over template and attribute stuff
-         if (chunk_is_token(prev, CT_ANGLE_CLOSE))
+         if (prev->Is(CT_ANGLE_CLOSE))
          {
             prev = skip_template_prev(prev);
          }
@@ -1733,28 +1744,28 @@ void mark_function(Chunk *pc)
          }
       }
       //LOG_FMT(LFCN, " -- stopped on %s [%s]\n",
-      //        prev->Text(), get_token_name(prev->type));
+      //        prev->Text(), get_token_name(prev->GetType()));
 
       // Fixes issue #1634
-      if (chunk_is_paren_close(prev))
+      if (prev->IsParenClose())
       {
          Chunk *preproc = prev->GetNextNcNnl();
 
-         if (chunk_is_token(preproc, CT_PREPROC))
+         if (preproc->Is(CT_PREPROC))
          {
-            size_t pp_level = preproc->pp_level;
+            size_t pp_level = preproc->GetPpLevel();
 
-            if (chunk_is_token(preproc->GetNextNcNnl(), CT_PP_ELSE))
+            if (preproc->GetNextNcNnl()->Is(CT_PP_ELSE))
             {
                do
                {
                   preproc = preproc->GetPrevNcNnlNi();      // Issue #2279
 
-                  if (chunk_is_token(preproc, CT_PP_IF))
+                  if (preproc->Is(CT_PP_IF))
                   {
                      preproc = preproc->GetPrevNcNnlNi();   // Issue #2279
 
-                     if (preproc->pp_level == pp_level)
+                     if (preproc->GetPpLevel() == pp_level)
                      {
                         prev = preproc->GetPrevNcNnlNpp();
                         break;
@@ -1768,38 +1779,33 @@ void mark_function(Chunk *pc)
       if (  isa_def
          && prev != nullptr
          && prev->IsNotNullChunk()
-         && (  (  chunk_is_paren_close(prev)
-               && get_chunk_parent_type(prev) != CT_D_CAST
-               && get_chunk_parent_type(prev) != CT_MACRO_OPEN  // Issue #2726
-               && get_chunk_parent_type(prev) != CT_MACRO_CLOSE)
-            || chunk_is_token(prev, CT_ASSIGN)
-            || chunk_is_token(prev, CT_RETURN)))
+         && (  (  prev->IsParenClose()
+               && prev->GetParentType() != CT_D_CAST
+               && prev->GetParentType() != CT_MACRO_OPEN  // Issue #2726
+               && prev->GetParentType() != CT_MACRO_CLOSE)
+            || prev->Is(CT_ASSIGN)
+            || prev->Is(CT_RETURN)))
       {
          LOG_FMT(LFCN, "%s(%d): -- overriding DEF due to prev is '%s', type is %s\n",
-                 __func__, __LINE__, prev->Text(), get_token_name(prev->type));
+                 __func__, __LINE__, prev->Text(), get_token_name(prev->GetType()));
          isa_def = false;
       }
 
       // Fixes issue #1266, identification of a tuple return type in CS.
       if (  !isa_def
-         && chunk_is_token(prev, CT_PAREN_CLOSE)
+         && prev->Is(CT_PAREN_CLOSE)
          && prev->GetNextNcNnl() == pc)
       {
-         tmp = chunk_skip_to_match_rev(prev);
-
-         if (tmp == nullptr)
-         {
-            tmp = Chunk::NullChunkPtr;
-         }
+         tmp = prev->GetOpeningParen();
 
          while (  tmp->IsNotNullChunk() // Issue #2315
                && tmp != prev)
          {
-            if (  chunk_is_token(tmp, CT_COMMA)
-               && tmp->level == prev->level + 1)
+            if (  tmp->Is(CT_COMMA)
+               && tmp->GetLevel() == prev->GetLevel() + 1)
             {
                LOG_FMT(LFCN, "%s(%d): -- overriding call due to tuple return type -- prev is '%s', type is %s\n",
-                       __func__, __LINE__, prev->Text(), get_token_name(prev->type));
+                       __func__, __LINE__, prev->Text(), get_token_name(prev->GetType()));
                isa_def = true;
                break;
             }
@@ -1809,11 +1815,11 @@ void mark_function(Chunk *pc)
 
       if (isa_def)
       {
-         LOG_FMT(LFCN, "%s(%d): pc is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-         LOG_FMT(LFCN, "%s(%d): (12) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-         set_chunk_type(pc, CT_FUNC_DEF);
+         LOG_FMT(LFCN, "%s(%d): pc 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()));
+         LOG_FMT(LFCN, "%s(%d): (12) SET TO CT_FUNC_DEF: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+         pc->SetType(CT_FUNC_DEF);
 
          if (  prev == nullptr
             || prev->IsNullChunk())
@@ -1824,24 +1830,25 @@ void mark_function(Chunk *pc)
          for (tmp = prev; tmp->IsNotNullChunk() && tmp != pc; tmp = tmp->GetNextNcNnlNpp())
          {
             LOG_FMT(LFCN, "%s(%d): Text() is '%s', type is %s\n",
-                    __func__, __LINE__, tmp->Text(), get_token_name(tmp->type));
+                    __func__, __LINE__, tmp->Text(), get_token_name(tmp->GetType()));
             make_type(tmp);
          }
       }
    }
 
-   if (chunk_is_not_token(pc, CT_FUNC_DEF))
+   if (pc->IsNot(CT_FUNC_DEF))
    {
-      LOG_FMT(LFCN, "%s(%d):  Detected type %s, Text() is '%s', on orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, get_token_name(pc->type),
-              pc->Text(), pc->orig_line, pc->orig_col);
+      LOG_FMT(LFCN, "%s(%d):  Detected type %s, Text() is '%s', on orig line %zu, orig col %zu\n",
+              __func__, __LINE__, get_token_name(pc->GetType()),
+              pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
 
       tmp = flag_parens(next, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
 
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         && get_chunk_parent_type(tmp) != CT_DOUBLE_BRACE)
+      if (  tmp != nullptr
+         && tmp->Is(CT_BRACE_OPEN)
+         && tmp->GetParentType() != CT_DOUBLE_BRACE)
       {
-         set_paren_parent(tmp, pc->type);
+         set_paren_parent(tmp, pc->GetType());
       }
       return;
    }
@@ -1861,35 +1868,35 @@ void mark_function(Chunk *pc)
    while (tmp->IsNotNullChunk())
    {
       // Only care about brace or semicolon on the same level
-      if (tmp->level < pc->level)
+      if (tmp->GetLevel() < pc->GetLevel())
       {
          // No semicolon - guess that it is a prototype
-         chunk_flags_clr(pc, PCF_VAR_1ST_DEF);
-         set_chunk_type(pc, CT_FUNC_PROTO);
+         pc->ResetFlagBits(PCF_VAR_1ST_DEF);
+         pc->SetType(CT_FUNC_PROTO);
          break;
       }
-      else if (tmp->level == pc->level)
+      else if (tmp->GetLevel() == pc->GetLevel())
       {
-         if (chunk_is_token(tmp, CT_BRACE_OPEN))
+         if (tmp->Is(CT_BRACE_OPEN))
          {
             // its a function def for sure
             break;
          }
-         else if (chunk_is_semicolon(tmp))
+         else if (tmp->IsSemicolon())
          {
             // Set the parent for the semicolon for later
             semi = tmp;
-            chunk_flags_clr(pc, PCF_VAR_1ST_DEF);
-            set_chunk_type(pc, CT_FUNC_PROTO);
-            LOG_FMT(LFCN, "%s(%d):   2) Marked Text() is '%s', as FUNC_PROTO on orig_line %zu, orig_col %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+            pc->ResetFlagBits(PCF_VAR_1ST_DEF);
+            pc->SetType(CT_FUNC_PROTO);
+            LOG_FMT(LFCN, "%s(%d):   2) Marked Text() is '%s', as FUNC_PROTO on orig line %zu, orig col %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
             break;
          }
-         else if (chunk_is_token(pc, CT_COMMA))
+         else if (pc->Is(CT_COMMA))
          {
-            set_chunk_type(pc, CT_FUNC_CTOR_VAR);
-            LOG_FMT(LFCN, "%s(%d):   2) Marked Text() is '%s', as FUNC_CTOR_VAR on orig_line %zu, orig_col %zu\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+            pc->SetType(CT_FUNC_CTOR_VAR);
+            LOG_FMT(LFCN, "%s(%d):   2) Marked Text() is '%s', as FUNC_CTOR_VAR on orig line %zu, orig col %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
             break;
          }
       }
@@ -1908,14 +1915,14 @@ void mark_function(Chunk *pc)
     * class or namespace, then it probably is a prototype.
     */
    if (  language_is_set(LANG_CPP)
-      && chunk_is_token(pc, CT_FUNC_PROTO)
-      && get_chunk_parent_type(pc) != CT_OPERATOR)
+      && pc->Is(CT_FUNC_PROTO)
+      && pc->GetParentType() != CT_OPERATOR)
    {
       LOG_FMT(LFPARAM, "%s(%d):", __func__, __LINE__);
       LOG_FMT(LFPARAM, "  checking '%s' for constructor variable %s %s\n",
               pc->Text(),
-              get_token_name(paren_open->type),
-              get_token_name(paren_close->type));
+              get_token_name(paren_open->GetType()),
+              get_token_name(paren_close->GetType()));
 
       /*
        * Check the token at the start of the statement. If it's 'extern', we
@@ -1924,12 +1931,12 @@ void mark_function(Chunk *pc)
       tmp = pc;
 
       while (  tmp->IsNotNullChunk()
-            && !tmp->flags.test(PCF_STMT_START))
+            && !tmp->TestFlags(PCF_STMT_START))
       {
          tmp = tmp->GetPrevNcNnlNi();   // Issue #2279
       }
       const bool is_extern = (  tmp->IsNotNullChunk()
-                             && tmp->str.equals("extern"));
+                             && tmp->GetStr().equals("extern"));
 
       /*
        * Scan the parameters looking for:
@@ -1947,8 +1954,8 @@ void mark_function(Chunk *pc)
       {
          tmp2 = tmp->GetNextNcNnl();
 
-         if (  chunk_is_token(tmp, CT_COMMA)
-            && (tmp->level == (paren_open->level + 1)))
+         if (  tmp->Is(CT_COMMA)
+            && (tmp->GetLevel() == (paren_open->GetLevel() + 1)))
          {
             if (!can_be_full_param(ref, tmp))
             {
@@ -1973,63 +1980,64 @@ void mark_function(Chunk *pc)
       if (  !is_extern
          && !is_param)
       {
-         set_chunk_type(pc, CT_FUNC_CTOR_VAR);
-         LOG_FMT(LFCN, "%s(%d):   3) Marked Text() '%s' as FUNC_CTOR_VAR on orig_line %zu, orig_col %zu\n",
-                 __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+         pc->SetType(CT_FUNC_CTOR_VAR);
+         LOG_FMT(LFCN, "%s(%d):   3) Marked Text() '%s' as FUNC_CTOR_VAR on orig line %zu, orig col %zu\n",
+                 __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
       }
-      else if (pc->brace_level > 0)
+      else if (pc->GetBraceLevel() > 0)
       {
-         Chunk *br_open = pc->GetPrevType(CT_BRACE_OPEN, pc->brace_level - 1);
+         Chunk *br_open = pc->GetPrevType(CT_BRACE_OPEN, pc->GetBraceLevel() - 1);
 
          if (  br_open->IsNotNullChunk()
-            && get_chunk_parent_type(br_open) != CT_EXTERN
-            && get_chunk_parent_type(br_open) != CT_NAMESPACE)
+            && br_open->GetParentType() != CT_EXTERN
+            && br_open->GetParentType() != CT_NAMESPACE)
          {
             // Do a check to see if the level is right
             prev = pc->GetPrevNcNnlNi();   // Issue #2279
 
-            if (  !chunk_is_str(prev, "*")
-               && !chunk_is_str(prev, "&"))
+            if (  !prev->IsString("*")
+               && !prev->IsString("&"))
             {
-               Chunk *p_op = pc->GetPrevType(CT_BRACE_OPEN, pc->brace_level - 1);
+               Chunk *p_op = pc->GetPrevType(CT_BRACE_OPEN, pc->GetBraceLevel() - 1);
 
                if (  p_op->IsNotNullChunk()
-                  && get_chunk_parent_type(p_op) != CT_CLASS
-                  && get_chunk_parent_type(p_op) != CT_STRUCT
-                  && get_chunk_parent_type(p_op) != CT_NAMESPACE)
+                  && p_op->GetParentType() != CT_CLASS
+                  && p_op->GetParentType() != CT_STRUCT
+                  && p_op->GetParentType() != CT_NAMESPACE)
                {
-                  set_chunk_type(pc, CT_FUNC_CTOR_VAR);
-                  LOG_FMT(LFCN, "%s(%d):   4) Marked Text() is'%s', as FUNC_CTOR_VAR on orig_line %zu, orig_col %zu\n",
-                          __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+                  pc->SetType(CT_FUNC_CTOR_VAR);
+                  LOG_FMT(LFCN, "%s(%d):   4) Marked Text() is'%s', as FUNC_CTOR_VAR on orig line %zu, orig col %zu\n",
+                          __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
                }
             }
          }
       }
    }
 
-   if (semi != nullptr)
+   if (  semi != nullptr
+      && semi->IsNotNullChunk())
    {
-      set_chunk_parent(semi, pc->type);
+      semi->SetParentType(pc->GetType());
    }
 
    // Issue # 1403, 2152
-   if (chunk_is_token(paren_open->prev, CT_FUNC_CTOR_VAR))
+   if (paren_open->GetPrev()->Is(CT_FUNC_CTOR_VAR))
    {
-      flag_parens(paren_open, PCF_IN_FCN_CTOR, CT_FPAREN_OPEN, pc->type, false);
+      flag_parens(paren_open, PCF_IN_FCN_CTOR, CT_FPAREN_OPEN, pc->GetType(), false);
    }
    else
    {
-      flag_parens(paren_open, PCF_IN_FCN_DEF, CT_FPAREN_OPEN, pc->type, false);
+      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->type, true);
+   //flag_parens(paren_open, PCF_IN_FCN_DEF, CT_FPAREN_OPEN, pc->GetType(), true);
 
-   if (chunk_is_token(pc, CT_FUNC_CTOR_VAR))
+   if (pc->Is(CT_FUNC_CTOR_VAR))
    {
-      chunk_flags_set(pc, PCF_VAR_1ST_DEF);
+      pc->SetFlagBits(PCF_VAR_1ST_DEF);
       return;
    }
 
-   if (chunk_is_token(next, CT_TSQUARE))
+   if (next->Is(CT_TSQUARE))
    {
       next = next->GetNextNcNnl();
 
@@ -2040,58 +2048,58 @@ void mark_function(Chunk *pc)
    }
    // Mark parameters and return type
    fix_fcn_def_params(next);
-   mark_function_return_type(pc, pc->GetPrevNcNnlNi(), pc->type);   // Issue #2279
+   mark_function_return_type(pc, pc->GetPrevNcNnlNi(), pc->GetType());   // Issue #2279
 
    /* mark C# where chunk */
    if (  language_is_set(LANG_CS)
-      && (  (chunk_is_token(pc, CT_FUNC_DEF))
-         || (chunk_is_token(pc, CT_FUNC_PROTO))))
+      && (  (pc->Is(CT_FUNC_DEF))
+         || (pc->Is(CT_FUNC_PROTO))))
    {
       tmp = paren_close->GetNextNcNnl();
-      pcf_flags_t in_where_spec_flags = PCF_NONE;
+      T_PcfFlags in_where_spec_flags = PCF_NONE;
 
       while (  tmp->IsNotNullChunk()
-            && chunk_is_not_token(tmp, CT_BRACE_OPEN)
-            && chunk_is_not_token(tmp, CT_SEMICOLON))
+            && tmp->IsNot(CT_BRACE_OPEN)
+            && tmp->IsNot(CT_SEMICOLON))
       {
-         mark_where_chunk(tmp, pc->type, tmp->flags | in_where_spec_flags);
-         in_where_spec_flags = tmp->flags & PCF_IN_WHERE_SPEC;
+         mark_where_chunk(tmp, pc->GetType(), tmp->GetFlags() | in_where_spec_flags);
+         in_where_spec_flags = tmp->GetFlags() & PCF_IN_WHERE_SPEC;
 
          tmp = tmp->GetNextNcNnl();
       }
    }
 
    // Find the brace pair and set the parent
-   if (chunk_is_token(pc, CT_FUNC_DEF))
+   if (pc->Is(CT_FUNC_DEF))
    {
       tmp = paren_close->GetNextNcNnl();
 
       while (  tmp->IsNotNullChunk()
-            && chunk_is_not_token(tmp, CT_BRACE_OPEN))
+            && tmp->IsNot(CT_BRACE_OPEN))
       {
-         LOG_FMT(LFCN, "%s(%d): (13) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
-         set_chunk_parent(tmp, CT_FUNC_DEF);
+         LOG_FMT(LFCN, "%s(%d): (13) SET TO CT_FUNC_DEF: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
+         tmp->SetParentType(CT_FUNC_DEF);
 
-         if (!chunk_is_semicolon(tmp))
+         if (!tmp->IsSemicolon())
          {
-            chunk_flags_set(tmp, PCF_OLD_FCN_PARAMS);
+            tmp->SetFlagBits(PCF_OLD_FCN_PARAMS);
          }
          tmp = tmp->GetNextNcNnl();
       }
 
-      if (chunk_is_token(tmp, CT_BRACE_OPEN))
+      if (tmp->Is(CT_BRACE_OPEN))
       {
-         LOG_FMT(LFCN, "%s(%d): (14) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
-         set_chunk_parent(tmp, CT_FUNC_DEF);
-         tmp = chunk_skip_to_match(tmp);
+         LOG_FMT(LFCN, "%s(%d): (14) SET TO CT_FUNC_DEF: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
+         tmp->SetParentType(CT_FUNC_DEF);
+         tmp = tmp->GetClosingParen();
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
-            LOG_FMT(LFCN, "%s(%d): (15) SET TO CT_FUNC_DEF: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                    __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
-            set_chunk_parent(tmp, CT_FUNC_DEF);
+            LOG_FMT(LFCN, "%s(%d): (15) SET TO CT_FUNC_DEF: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                    __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
+            tmp->SetParentType(CT_FUNC_DEF);
          }
       }
    }
@@ -2101,9 +2109,9 @@ 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",
-           __func__, __LINE__, get_token_name(pc->type), pc->Text(),
-           pc->orig_line, pc->orig_col);
+   LOG_FMT(LFTYPE, "%s(%d): type is %s, Text() '%s' @ orig line is %zu, orig col is %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;
@@ -2118,23 +2126,23 @@ bool mark_function_type(Chunk *pc)
    // Scan backwards across the name, which can only be a word and single star
    Chunk *varcnk = pc->GetPrevNcNnlNi();   // Issue #2279
 
-   varcnk = chunk_get_prev_ssq(varcnk);
+   varcnk = varcnk->GetPrevNbsb();
 
    if (  varcnk->IsNotNullChunk()
-      && !chunk_is_word(varcnk))
+      && !varcnk->IsWord())
    {
       if (  language_is_set(LANG_OC)
-         && chunk_is_str(varcnk, "^")
-         && chunk_is_paren_open(varcnk->GetPrevNcNnlNi()))   // Issue #2279
+         && varcnk->IsString("^")
+         && varcnk->GetPrevNcNnlNi()->IsParenOpen())   // Issue #2279
       {
          // anonymous ObjC block type -- RTYPE (^)(ARGS)
          anon = true;
       }
       else
       {
-         LOG_FMT(LFTYPE, "%s(%d): not a word: Text() '%s', type is %s, @ orig_line is %zu:, orig_col is %zu\n",
-                 __func__, __LINE__, varcnk->Text(), get_token_name(varcnk->type),
-                 varcnk->orig_line, varcnk->orig_col);
+         LOG_FMT(LFTYPE, "%s(%d): not a word: Text() '%s', type is %s, @ orig line is %zu:, orig col is %zu\n",
+                 __func__, __LINE__, varcnk->Text(), get_token_name(varcnk->GetType()),
+                 varcnk->GetOrigLine(), varcnk->GetOrigCol());
          goto nogo_exit;
       }
    }
@@ -2144,23 +2152,23 @@ bool mark_function_type(Chunk *pc)
    {
       return(false);
    }
-   apc = chunk_skip_to_match(apo);
+   apc = apo->GetClosingParen();
 
-   if (  apc != nullptr
-      && (  !chunk_is_paren_open(apo)
-         || ((apc = chunk_skip_to_match(apo)) == nullptr)))
+   if (  apc->IsNotNullChunk()
+      && (  !apo->IsParenOpen()
+         || ((apc = apo->GetClosingParen())->IsNullChunk())))
    {
       LOG_FMT(LFTYPE, "%s(%d): not followed by parens\n", __func__, __LINE__);
       goto nogo_exit;
    }
    aft = apc->GetNextNcNnl();
 
-   if (chunk_is_token(aft, CT_BRACE_OPEN))
+   if (aft->Is(CT_BRACE_OPEN))
    {
       pt = CT_FUNC_DEF;
    }
-   else if (  chunk_is_token(aft, CT_SEMICOLON)
-           || chunk_is_token(aft, CT_ASSIGN))
+   else if (  aft->Is(CT_SEMICOLON)
+           || aft->Is(CT_ASSIGN))
    {
       pt = CT_FUNC_PROTO;
    }
@@ -2169,54 +2177,54 @@ bool mark_function_type(Chunk *pc)
       LOG_FMT(LFTYPE, "%s(%d): not followed by '{' or ';'\n", __func__, __LINE__);
       goto nogo_exit;
    }
-   ptp = pc->flags.test(PCF_IN_TYPEDEF) ? CT_FUNC_TYPE : CT_FUNC_VAR;
+   ptp = pc->TestFlags(PCF_IN_TYPEDEF) ? CT_FUNC_TYPE : CT_FUNC_VAR;
 
    tmp = pc;
 
    while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
-      tmp = chunk_get_prev_ssq(tmp);
+      tmp = tmp->GetPrevNbsb();
 
-      LOG_FMT(LFTYPE, " -- type is %s, %s on orig_line %zu, orig_col is %zu",
-              get_token_name(tmp->type), tmp->Text(),
-              tmp->orig_line, tmp->orig_col);
+      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()
-         || chunk_is_token(tmp, CT_PTR_TYPE)
-         || chunk_is_token(tmp, CT_CARET))
+         || tmp->Is(CT_PTR_TYPE)
+         || tmp->Is(CT_CARET))
       {
          star_count++;
          ptrcnk = tmp;
          LOG_FMT(LFTYPE, " -- PTR_TYPE\n");
       }
-      else if (  chunk_is_word(tmp)
-              || chunk_is_token(tmp, CT_WORD)
-              || chunk_is_token(tmp, CT_TYPE))
+      else if (  tmp->IsWord()
+              || tmp->Is(CT_WORD)
+              || tmp->Is(CT_TYPE))
       {
          word_count++;
          LOG_FMT(LFTYPE, " -- TYPE(%s)\n", tmp->Text());
       }
-      else if (chunk_is_token(tmp, CT_DC_MEMBER))
+      else if (tmp->Is(CT_DC_MEMBER))
       {
          word_count = 0;
          LOG_FMT(LFTYPE, " -- :: reset word_count\n");
       }
-      else if (chunk_is_str(tmp, "("))
+      else if (tmp->IsString("("))
       {
          LOG_FMT(LFTYPE, " -- open paren (break)\n");
          break;
       }
       else
       {
-         LOG_FMT(LFTYPE, " --  unexpected token: type is %s, Text() '%s', on orig_line %zu, orig_col %zu\n",
-                 get_token_name(tmp->type), tmp->Text(),
-                 tmp->orig_line, tmp->orig_col);
+         LOG_FMT(LFTYPE, " --  unexpected token: type is %s, Text() '%s', on orig line %zu, orig col %zu\n",
+                 get_token_name(tmp->GetType()), tmp->Text(),
+                 tmp->GetOrigLine(), tmp->GetOrigCol());
          goto nogo_exit;
       }
    }
 
    // Fixes #issue 1577
-   // Allow word count 2 incase of function pointer declaration.
+   // Allow word count 2 in case of function pointer declaration.
    // Ex: bool (__stdcall* funcptr)(int, int);
    if (  star_count > 1
       || (  word_count > 1
@@ -2237,35 +2245,35 @@ bool mark_function_type(Chunk *pc)
 
    if (ptrcnk)
    {
-      set_chunk_type(ptrcnk, CT_PTR_TYPE);
+      ptrcnk->SetType(CT_PTR_TYPE);
    }
 
    if (!anon)
    {
-      if (pc->flags.test(PCF_IN_TYPEDEF))
+      if (pc->TestFlags(PCF_IN_TYPEDEF))
       {
-         set_chunk_type(varcnk, CT_FUNC_TYPE);   // Issue #3402
+         varcnk->SetType(CT_FUNC_TYPE);   // Issue #3402
       }
       else
       {
-         set_chunk_type(varcnk, CT_FUNC_VAR);
-         chunk_flags_set(varcnk, PCF_VAR_1ST_DEF);
+         varcnk->SetType(CT_FUNC_VAR);
+         varcnk->SetFlagBits(PCF_VAR_1ST_DEF);
       }
    }
-   set_chunk_type(pc, CT_TPAREN_CLOSE);
-   set_chunk_parent(pc, ptp);
+   pc->SetType(CT_TPAREN_CLOSE);
+   pc->SetParentType(ptp);
 
-   set_chunk_type(apo, CT_FPAREN_OPEN);
-   set_chunk_parent(apo, pt);
-   set_chunk_type(apc, CT_FPAREN_CLOSE);
-   set_chunk_parent(apc, pt);
+   apo->SetType(CT_FPAREN_OPEN);
+   apo->SetParentType(pt);
+   apc->SetType(CT_FPAREN_CLOSE);
+   apc->SetParentType(pt);
    fix_fcn_def_params(apo);
 
-   if (chunk_is_semicolon(aft))
+   if (aft->IsSemicolon())
    {
-      set_chunk_parent(aft, aft->flags.test(PCF_IN_TYPEDEF) ? CT_TYPEDEF : CT_FUNC_VAR);
+      aft->SetParentType(aft->TestFlags(PCF_IN_TYPEDEF) ? CT_TYPEDEF : CT_FUNC_VAR);
    }
-   else if (chunk_is_token(aft, CT_BRACE_OPEN))
+   else if (aft->Is(CT_BRACE_OPEN))
    {
       flag_parens(aft, PCF_NONE, CT_NONE, pt, false);
    }
@@ -2274,29 +2282,29 @@ bool mark_function_type(Chunk *pc)
 
    while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
-      LOG_FMT(LFTYPE, " ++ type is %s, Text() '%s', on orig_line %zu, orig_col %zu\n",
-              get_token_name(tmp->type), tmp->Text(),
-              tmp->orig_line, tmp->orig_col);
+      LOG_FMT(LFTYPE, " ++ type is %s, Text() '%s', on orig line %zu, orig col %zu\n",
+              get_token_name(tmp->GetType()), tmp->Text(),
+              tmp->GetOrigLine(), tmp->GetOrigCol());
 
-      if (*tmp->str.c_str() == '(')
+      if (*tmp->GetStr().c_str() == '(')
       {
-         if (!pc->flags.test(PCF_IN_TYPEDEF))
+         if (!pc->TestFlags(PCF_IN_TYPEDEF))
          {
-            chunk_flags_set(tmp, PCF_VAR_1ST_DEF);
+            tmp->SetFlagBits(PCF_VAR_1ST_DEF);
          }
-         set_chunk_type(tmp, CT_TPAREN_OPEN);
-         set_chunk_parent(tmp, ptp);
+         tmp->SetType(CT_TPAREN_OPEN);
+         tmp->SetParentType(ptp);
 
          tmp = tmp->GetPrevNcNnlNi();   // Issue #2279
 
-         if (  chunk_is_token(tmp, CT_FUNCTION)
-            || chunk_is_token(tmp, CT_FUNC_CALL)
-            || chunk_is_token(tmp, CT_FUNC_CALL_USER)
-            || chunk_is_token(tmp, CT_FUNC_DEF)
-            || chunk_is_token(tmp, CT_FUNC_PROTO))
+         if (  tmp->Is(CT_FUNCTION)
+            || tmp->Is(CT_FUNC_CALL)
+            || tmp->Is(CT_FUNC_CALL_USER)
+            || tmp->Is(CT_FUNC_DEF)
+            || tmp->Is(CT_FUNC_PROTO))
          {
-            set_chunk_type(tmp, CT_TYPE);
-            chunk_flags_clr(tmp, PCF_VAR_1ST_DEF);
+            tmp->SetType(CT_TYPE);
+            tmp->ResetFlagBits(PCF_VAR_1ST_DEF);
          }
          mark_function_return_type(varcnk, tmp, ptp);
          break;
@@ -2307,10 +2315,10 @@ bool mark_function_type(Chunk *pc)
 nogo_exit:
    tmp = pc->GetNextNcNnl();
 
-   if (chunk_is_paren_open(tmp))
+   if (tmp->IsParenOpen())
    {
-      LOG_FMT(LFTYPE, "%s(%d): setting FUNC_CALL on orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, tmp->orig_line, tmp->orig_col);
+      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);
    }
    return(false);
@@ -2320,37 +2328,36 @@ nogo_exit:
 void mark_lvalue(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   Chunk *prev;
 
-   if (pc->flags.test(PCF_IN_PREPROC))
+   if (pc->TestFlags(PCF_IN_PREPROC))
    {
       return;
    }
 
-   for (prev = pc->GetPrevNcNnlNi();     // Issue #2279
+   for (Chunk *prev = pc->GetPrevNcNnlNi();  // Issue #2279
         prev->IsNotNullChunk();
-        prev = prev->GetPrevNcNnlNi())   // Issue #2279
-   {
-      if (  prev->level < pc->level
-         || chunk_is_token(prev, CT_ACCESS_COLON)
-         || chunk_is_token(prev, CT_ASSIGN)
-         || chunk_is_token(prev, CT_BOOL)
-         || chunk_is_token(prev, CT_COMMA)
-         || chunk_is_cpp_inheritance_access_specifier(prev)
-         || chunk_is_semicolon(prev)
-         || chunk_is_str(prev, "(")
-         || chunk_is_str(prev, "{")
-         || chunk_is_str(prev, "[")
-         || prev->flags.test(PCF_IN_PREPROC)
-         || get_chunk_parent_type(prev) == CT_NAMESPACE
-         || get_chunk_parent_type(prev) == CT_TEMPLATE)
+        prev = prev->GetPrevNcNnlNi())       // Issue #2279
+   {
+      if (  prev->GetLevel() < pc->GetLevel()
+         || prev->Is(CT_ACCESS_COLON)
+         || prev->Is(CT_ASSIGN)
+         || prev->Is(CT_BOOL)
+         || prev->Is(CT_COMMA)
+         || prev->IsCppInheritanceAccessSpecifier()
+         || prev->IsSemicolon()
+         || prev->IsString("(")
+         || prev->IsString("{")
+         || prev->IsString("[")
+         || prev->TestFlags(PCF_IN_PREPROC)
+         || prev->GetParentType() == CT_NAMESPACE
+         || prev->GetParentType() == CT_TEMPLATE)
       {
          break;
       }
-      chunk_flags_set(prev, PCF_LVALUE);
+      prev->SetFlagBits(PCF_LVALUE);
 
-      if (  prev->level == pc->level
-         && chunk_is_str(prev, "&"))
+      if (  prev->GetLevel() == pc->GetLevel()
+         && prev->IsString("&"))
       {
          make_type(prev);
       }
@@ -2364,13 +2371,13 @@ void mark_struct_union_body(Chunk *start)
    Chunk *pc = start;
 
    while (  pc->IsNotNullChunk()
-         && pc->level >= start->level
-         && !(  pc->level == start->level
-             && chunk_is_token(pc, CT_BRACE_CLOSE)))
+         && pc->GetLevel() >= start->GetLevel()
+         && !(  pc->GetLevel() == start->GetLevel()
+             && pc->Is(CT_BRACE_CLOSE)))
    {
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_SEMICOLON))
+      if (  pc->Is(CT_BRACE_OPEN)
+         || pc->Is(CT_BRACE_CLOSE)
+         || pc->Is(CT_SEMICOLON))
       {
          pc = pc->GetNextNcNnl();
 
@@ -2380,7 +2387,7 @@ void mark_struct_union_body(Chunk *start)
          }
       }
 
-      if (chunk_is_token(pc, CT_ALIGN))
+      if (pc->Is(CT_ALIGN))
       {
          pc = skip_align(pc); // "align(x)" or "align(x):"
 
@@ -2389,7 +2396,7 @@ void mark_struct_union_body(Chunk *start)
             break;
          }
       }
-      else if (chunk_is_token(pc, CT_AMP))
+      else if (pc->Is(CT_AMP))
       {
          pc = skip_expression(pc);
       }
@@ -2411,20 +2418,20 @@ void mark_template_func(Chunk *pc, Chunk *pc_next)
    LOG_FUNC_ENTRY();
 
    // We know angle_close must be there...
-   Chunk *angle_close = pc_next->GetNextType(CT_ANGLE_CLOSE, pc->level);
+   Chunk *angle_close = pc_next->GetNextType(CT_ANGLE_CLOSE, pc->GetLevel());
    Chunk *after       = angle_close->GetNextNcNnl();
 
    if (after->IsNotNullChunk())
    {
-      if (chunk_is_str(after, "("))
+      if (after->IsString("("))
       {
-         if (angle_close->flags.test(PCF_IN_FCN_CALL))
+         if (angle_close->TestFlags(PCF_IN_FCN_CALL))
          {
             LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line);
-            LOG_FMT(LFCN, "%s(%d): (16) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-            set_chunk_type(pc, CT_FUNC_CALL);
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine());
+            LOG_FMT(LFCN, "%s(%d): (16) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+            pc->SetType(CT_FUNC_CALL);
             flag_parens(after, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
          }
          else
@@ -2438,20 +2445,20 @@ void mark_template_func(Chunk *pc, Chunk *pc_next)
              */
 
             LOG_FMT(LTEMPFUNC, "%s(%d): marking '%s' in line %zu as a FUNC_CALL 2\n",
-                    __func__, __LINE__, pc->Text(), pc->orig_line);
+                    __func__, __LINE__, pc->Text(), pc->GetOrigLine());
             // its a function!!!
-            LOG_FMT(LFCN, "%s(%d): (17) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
-            set_chunk_type(pc, CT_FUNC_CALL);
+            LOG_FMT(LFCN, "%s(%d): (17) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+            pc->SetType(CT_FUNC_CALL);
             mark_function(pc);
          }
       }
-      else if (chunk_is_token(after, CT_WORD))
+      else if (after->Is(CT_WORD))
       {
          // its a type!
-         set_chunk_type(pc, CT_TYPE);
-         chunk_flags_set(pc, PCF_VAR_TYPE);
-         chunk_flags_set(after, PCF_VAR_DEF);
+         pc->SetType(CT_TYPE);
+         pc->SetFlagBits(PCF_VAR_TYPE);
+         after->SetFlagBits(PCF_VAR_DEF);
       }
    }
 } // mark_template_func
@@ -2465,56 +2472,56 @@ Chunk *mark_variable_definition(Chunk *start)
    {
       return(nullptr);
    }
-   Chunk       *pc   = start;
-   pcf_flags_t flags = PCF_VAR_1ST_DEF;
+   Chunk      *pc   = start;
+   T_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->orig_line, pc->orig_col, pc->Text(),
-           get_token_name(pc->type));
+   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(),
+           get_token_name(pc->GetType()));
 
    // Issue #596
    bool bit_field_colon_is_present = false;
 
    while (go_on(pc, start))
    {
-      if (  chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_FUNC_CTOR_VAR))
+      if (  pc->Is(CT_WORD)
+         || pc->Is(CT_FUNC_CTOR_VAR))
       {
-         auto const orig_flags = pc->flags;
+         auto const orig_flags = pc->GetFlags();
 
-         if (!pc->flags.test(PCF_IN_ENUM))
+         if (!pc->TestFlags(PCF_IN_ENUM))
          {
-            chunk_flags_set(pc, flags);
+            pc->SetFlagBits(flags);
          }
          flags &= ~PCF_VAR_1ST;
-         LOG_FMT(LVARDEF, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', set PCF_VAR_1ST\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+         LOG_FMT(LVARDEF, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', set PCF_VAR_1ST\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
 
          LOG_FMT(LVARDEF,
-                 "%s(%d): orig_line is %zu, marked Text() '%s'[%s]\n"
-                 "   in orig_col %zu, flags: %s -> %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->Text(),
-                 get_token_name(pc->type), pc->orig_col,
+                 "%s(%d): orig line is %zu, marked Text() '%s'[%s]\n"
+                 "   in orig col %zu, flags: %s -> %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->Text(),
+                 get_token_name(pc->GetType()), pc->GetOrigCol(),
                  pcf_flags_str(orig_flags).c_str(),
-                 pcf_flags_str(pc->flags).c_str());
+                 pcf_flags_str(pc->GetFlags()).c_str());
       }
       else if (  !bit_field_colon_is_present                      // Issue #2689
               && (  pc->IsStar()
-                 || chunk_is_msref(pc)))
+                 || pc->IsMsRef()))
       {
-         set_chunk_type(pc, CT_PTR_TYPE);
+         pc->SetType(CT_PTR_TYPE);
       }
-      else if (chunk_is_addr(pc))
+      else if (pc->IsAddress())
       {
-         set_chunk_type(pc, CT_BYREF);
+         pc->SetType(CT_BYREF);
       }
-      else if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-              || chunk_is_token(pc, CT_ASSIGN))
+      else if (  pc->Is(CT_SQUARE_OPEN)
+              || pc->Is(CT_ASSIGN))
       {
          pc = skip_expression(pc);
          continue;
       }
-      else if (chunk_is_token(pc, CT_COLON))
+      else if (pc->Is(CT_COLON))
       {
          bit_field_colon_is_present = true;                    // Issue #2689
       }
@@ -2534,84 +2541,83 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
 
    if (  var_name != nullptr
       && var_name->GetPrev()->IsNotNullChunk()
-      && var_name->GetPrev()->type == CT_DC_MEMBER)
+      && var_name->GetPrev()->GetType() == CT_DC_MEMBER)
    {
       cs.Push_Back(var_name);
    }
 
    if (var_name != nullptr)
    {
-      LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu:\n",
-              __func__, __LINE__, var_name->orig_line, var_name->orig_col);
+      LOG_FMT(LFCNP, "%s(%d): parameter on orig line %zu, orig col %zu:\n",
+              __func__, __LINE__, var_name->GetOrigLine(), var_name->GetOrigCol());
 
       size_t word_cnt = 0;
       Chunk  *word_type;
 
       while ((word_type = cs.Pop_Back()) != nullptr)
       {
-         if (  chunk_is_token(word_type, CT_WORD)
-            || chunk_is_token(word_type, CT_TYPE))
+         if (  word_type->Is(CT_WORD)
+            || word_type->Is(CT_TYPE))
          {
-            LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu: <%s> as TYPE\n",
-                    __func__, __LINE__, var_name->orig_line, var_name->orig_col, word_type->Text());
-            set_chunk_type(word_type, CT_TYPE);
-            chunk_flags_set(word_type, PCF_VAR_TYPE);
+            LOG_FMT(LFCNP, "%s(%d): parameter on orig line %zu, orig col %zu: <%s> as TYPE\n",
+                    __func__, __LINE__, var_name->GetOrigLine(), var_name->GetOrigCol(), word_type->Text());
+            word_type->SetType(CT_TYPE);
+            word_type->SetFlagBits(PCF_VAR_TYPE);
          }
          word_cnt++;
       }
 
-      if (chunk_is_token(var_name, CT_WORD))
+      if (var_name->Is(CT_WORD))
       {
          if (word_cnt > 0)
          {
-            LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu: <%s> as VAR\n",
-                    __func__, __LINE__, var_name->orig_line, var_name->orig_col, var_name->Text());
-            chunk_flags_set(var_name, PCF_VAR_DEF);
+            LOG_FMT(LFCNP, "%s(%d): parameter on orig line %zu, orig col %zu: <%s> as VAR\n",
+                    __func__, __LINE__, var_name->GetOrigLine(), var_name->GetOrigCol(), var_name->Text());
+            var_name->SetFlagBits(PCF_VAR_DEF);
          }
          else
          {
-            LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu: <%s> as TYPE\n",
-                    __func__, __LINE__, var_name->orig_line, var_name->orig_col, var_name->Text());
-            set_chunk_type(var_name, CT_TYPE);
-            chunk_flags_set(var_name, PCF_VAR_TYPE);
+            LOG_FMT(LFCNP, "%s(%d): parameter on orig line %zu, orig col %zu: <%s> as TYPE\n",
+                    __func__, __LINE__, var_name->GetOrigLine(), var_name->GetOrigCol(), var_name->Text());
+            var_name->SetType(CT_TYPE);
+            var_name->SetFlagBits(PCF_VAR_TYPE);
          }
       }
    }
 } // mark_variable_stack
 
 
-pcf_flags_t mark_where_chunk(Chunk *pc, E_Token parent_type, pcf_flags_t flags)
+T_PcfFlags mark_where_chunk(Chunk *pc, E_Token parent_type, T_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.) */
 
-   if (chunk_is_token(pc, CT_WHERE))
+   if (pc->Is(CT_WHERE))
    {
-      set_chunk_type(pc, CT_WHERE_SPEC);
-      set_chunk_parent(pc, parent_type);
+      pc->SetType(CT_WHERE_SPEC);
+      pc->SetParentType(parent_type);
       flags |= PCF_IN_WHERE_SPEC;
       LOG_FMT(LFTOR, "%s: where-spec on line %zu\n",
-              __func__, pc->orig_line);
+              __func__, pc->GetOrigLine());
    }
    else if (flags.test(PCF_IN_WHERE_SPEC))
    {
-      if (chunk_is_str(pc, ":"))
+      if (pc->IsString(":"))
       {
-         set_chunk_type(pc, CT_WHERE_COLON);
+         pc->SetType(CT_WHERE_COLON);
          LOG_FMT(LFTOR, "%s: where-spec colon on line %zu\n",
-                 __func__, pc->orig_line);
+                 __func__, pc->GetOrigLine());
       }
-      else if (  (chunk_is_token(pc, CT_STRUCT))
-              || (chunk_is_token(pc, CT_CLASS)))
+      else if (pc->IsClassOrStruct())
       {
          /* class/struct inside of a where-clause confuses parser for indentation; set it as a word so it looks like the rest */
-         set_chunk_type(pc, CT_WORD);
+         pc->SetType(CT_WORD);
       }
    }
 
    if (flags.test(PCF_IN_WHERE_SPEC))
    {
-      chunk_flags_set(pc, PCF_IN_WHERE_SPEC);
+      pc->SetFlagBits(PCF_IN_WHERE_SPEC);
    }
    return(flags);
 } // mark_where_chunk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.h
index 4671fbb3..dd6d26fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.h
@@ -84,7 +84,7 @@ void mark_cpp_lambda(Chunk *square_open);
  * Marks statement starts in a macro body.
  * REVISIT: this may already be done
  */
-void mark_define_expressions(void);
+void mark_define_expressions();
 
 
 /**
@@ -190,7 +190,7 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev);
  * TODO: add doc cmt
  *
  */
-pcf_flags_t mark_where_chunk(Chunk *pc, E_Token parent_type, pcf_flags_t flags);
+T_PcfFlags mark_where_chunk(Chunk *pc, E_Token parent_type, T_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.76.0/src/combine_labels.cpp
new file mode 100644
index 00000000..a49a1fd4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_labels.cpp
@@ -0,0 +1,446 @@
+/**
+ * @file combine_labels.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ * extract from combine.h
+ */
+
+#include "combine_labels.h"
+
+#include "chunk.h"
+#include "cs_top_is_question.h"
+#include "unc_tools.h"
+#include "uncrustify.h"
+
+
+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);
+   } while (  tmp->IsNotNullChunk()
+           && (  tmp->IsComment()
+              || tmp->Is(CT_NOEXCEPT)));
+
+   return(tmp);
+}
+
+
+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);
+   } while (  tmp->IsNotNullChunk()
+           && (  tmp->IsCommentOrNewline()
+              || tmp->Is(CT_NOEXCEPT)));
+
+   return(tmp);
+}
+
+
+void combine_labels()
+{
+   LOG_FUNC_ENTRY();
+   bool hit_case  = false;
+   bool hit_class = false;
+
+   cpd.unc_stage = unc_stage_e::COMBINE_LABELS;
+
+   // stack to handle nesting inside of OC messages, which reset the scope
+   ChunkStack cs;
+
+   Chunk      *prev = Chunk::GetHead();
+
+   if (prev->IsNullChunk())
+   {
+      return;
+   }
+   Chunk *cur = prev->GetNextNc();
+
+   if (cur->IsNullChunk())
+   {
+      return;
+   }
+   Chunk *next = cur->GetNextNc();
+
+   // unlikely that the file will start with a label...
+   // prev cur next
+   while (  next != nullptr
+         && next->IsNotNullChunk())
+   {
+      if (next->Is(CT_NEWLINE))
+      {
+         LOG_FMT(LFCN, "%s(%d): next orig line is %zu, orig col is %zu, <Newline>, nl is %zu\n",
+                 __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->GetNlCount());
+      }
+      else if (next->Is(CT_VBRACE_OPEN))
+      {
+         LOG_FMT(LFCN, "%s(%d): next orig line is %zu, orig col is %zu, VBRACE_OPEN\n",
+                 __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol());
+      }
+      else if (next->Is(CT_VBRACE_CLOSE))
+      {
+         LOG_FMT(LFCN, "%s(%d): next orig line is %zu, orig col is %zu, VBRACE_CLOSE\n",
+                 __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol());
+      }
+      else
+      {
+         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()));
+      }
+
+      if (  !next->TestFlags(PCF_IN_OC_MSG) // filter OC case of [self class] msg send
+         && (  next->Is(CT_CLASS)
+            || next->Is(CT_OC_CLASS)
+            || next->Is(CT_TEMPLATE)))
+      {
+         hit_class = true;
+      }
+
+      if (  next->IsSemicolon()
+         || next->Is(CT_BRACE_OPEN))
+      {
+         hit_class = false;
+      }
+
+      if (  prev->Is(CT_SQUARE_OPEN)
+         && prev->GetParentType() == CT_OC_MSG)
+      {
+         cs.Push_Back(prev);
+      }
+      else if (  next->Is(CT_SQUARE_CLOSE)
+              && next->GetParentType() == CT_OC_MSG)
+      {
+         // pop until we hit '['
+         while (!cs.Empty())
+         {
+            Chunk *t2 = cs.Top()->m_pc;
+            cs.Pop_Back();
+
+            if (t2->Is(CT_SQUARE_OPEN))
+            {
+               break;
+            }
+         }
+      }
+
+      if (  next->Is(CT_QUESTION)
+         && !next->TestFlags(PCF_IN_TEMPLATE))
+      {
+         cs.Push_Back(next);
+      }
+      else if (next->Is(CT_CASE))
+      {
+         if (cur->Is(CT_GOTO))
+         {
+            // handle "goto case x;"
+            next->SetType(CT_QUALIFIER);
+         }
+         else
+         {
+            hit_case = true;
+         }
+      }
+      else if (  next->Is(CT_COLON)
+              || (  next->Is(CT_OC_COLON)
+                 && cs_top_is_question(cs, next->GetLevel())))
+      {
+         if (cur->Is(CT_DEFAULT))
+         {
+            cur->SetType(CT_CASE);
+            hit_case = true;
+         }
+
+         if (  cs_top_is_question(cs, next->GetLevel())
+            && !cur->Is(CT_OC_MSG_NAME)
+            && next->TestFlags(PCF_IN_CONDITIONAL))             // Issue #3558
+         {
+            //log_pcf_flags(LGUY, next->GetFlags());
+            next->SetType(CT_COND_COLON);
+            cs.Pop_Back();
+         }
+         else if (hit_case)
+         {
+            hit_case = false;
+            next->SetType(CT_CASE_COLON);
+            Chunk *tmp = next->GetNextNcNnlNpp();                // Issue #2150
+
+            if (tmp->Is(CT_BRACE_OPEN))
+            {
+               tmp->SetParentType(CT_CASE);
+               tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->GetLevel());
+
+               if (tmp->IsNotNullChunk())
+               {
+                  tmp->SetParentType(CT_CASE);
+               }
+            }
+
+            if (  cur->Is(CT_NUMBER)
+               && prev->Is(CT_ELLIPSIS))
+            {
+               Chunk *pre_elipsis = prev->GetPrevNcNnlNpp();
+
+               if (pre_elipsis->Is(CT_NUMBER))
+               {
+                  prev->SetType(CT_CASE_ELLIPSIS);
+               }
+            }
+         }
+         else if (cur->TestFlags(PCF_IN_WHERE_SPEC))
+         {
+            /* leave colons in where-constraint clauses alone */
+         }
+         else
+         {
+            LOG_FMT(LFCN, "%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(LFCN, "%s(%d): cur->Text() is '%s', orig line is %zu, orig col is %zu\n",
+                    __func__, __LINE__, cur->Text(), cur->GetOrigLine(), cur->GetOrigCol());
+            LOG_FMT(LFCN, "%s(%d): next->Text() is '%s', orig line is %zu, orig col is %zu\n",
+                    __func__, __LINE__, next->Text(), next->GetOrigLine(), next->GetOrigCol());
+            Chunk *nextprev = chunk_get_prev_local(next);   // Issue #2279
+
+            if (nextprev == nullptr)
+            {
+               return;
+            }
+
+            if (language_is_set(LANG_PAWN))
+            {
+               if (  cur->Is(CT_WORD)
+                  || cur->Is(CT_BRACE_CLOSE))
+               {
+                  E_Token new_type = CT_TAG;
+
+                  Chunk   *tmp = next->GetNextNc();
+
+                  if (tmp->IsNullChunk())
+                  {
+                     return;
+                  }
+
+                  if (  prev->IsNewline()
+                     && tmp->IsNewline())
+                  {
+                     new_type = CT_LABEL;
+                     next->SetType(CT_LABEL_COLON);
+                  }
+                  else
+                  {
+                     next->SetType(CT_TAG_COLON);
+                  }
+
+                  if (cur->Is(CT_WORD))
+                  {
+                     cur->SetType(new_type);
+                  }
+               }
+            }
+            else if (next->TestFlags(PCF_IN_ARRAY_ASSIGN))
+            {
+               next->SetType(CT_D_ARRAY_COLON);
+            }
+            else if (next->TestFlags(PCF_IN_FOR))
+            {
+               next->SetType(CT_FOR_COLON);
+            }
+            else if (next->TestFlags(PCF_OC_BOXED))
+            {
+               next->SetType(CT_OC_DICT_COLON);
+            }
+            else if (cur->Is(CT_WORD))
+            {
+               Chunk *tmp = next->GetNextNc(E_Scope::PREPROC);
+
+               // Issue #1187
+               if (tmp->IsNullChunk())
+               {
+                  return;
+               }
+               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());
+
+               if (next->TestFlags(PCF_IN_FCN_CALL))
+               {
+                  // Must be a macro thingy, assume some sort of label
+                  next->SetType(CT_LABEL_COLON);
+               }
+               else if (  tmp->IsNullChunk()
+                       || (  tmp->IsNot(CT_NUMBER)
+                          && tmp->IsNot(CT_DECLTYPE)
+                          && tmp->IsNot(CT_SIZEOF)
+                          && tmp->GetParentType() != CT_SIZEOF
+                          && !tmp->GetFlags().test_any(PCF_IN_STRUCT | PCF_IN_CLASS))
+                       || tmp->Is(CT_NEWLINE))
+               {
+                  /*
+                   * the CT_SIZEOF isn't great - test 31720 happens to use a sizeof expr,
+                   * but this really should be able to handle any constant expr
+                   */
+                  // Fix for #1242
+                  // For MIDL_INTERFACE classes class name is tokenized as Label.
+                  // Corrected the identification of Label in c style languages.
+                  if (  language_is_set(LANG_C | LANG_CPP | LANG_CS)
+                     && (!language_is_set(LANG_OC)))
+                  {
+                     Chunk *labelPrev = prev;
+
+                     if (labelPrev->Is(CT_NEWLINE))
+                     {
+                        labelPrev = prev->GetPrevNcNnlNi();   // Issue #2279
+                     }
+
+                     if (  labelPrev->IsNotNullChunk()
+                        && labelPrev->IsNot(CT_FPAREN_CLOSE))
+                     {
+                        cur->SetType(CT_LABEL);
+                        next->SetType(CT_LABEL_COLON);
+                     }
+                  }
+                  else
+                  {
+                     cur->SetType(CT_LABEL);
+                     next->SetType(CT_LABEL_COLON);
+                  }
+               }
+               else if (next->GetFlags().test_any(PCF_IN_STRUCT | PCF_IN_CLASS | PCF_IN_TYPEDEF))
+               {
+                  next->SetType(CT_BIT_COLON);
+
+                  Chunk *nnext = next->GetNext();
+
+                  if (nnext->IsNullChunk())
+                  {
+                     return;
+                  }
+
+                  while ((nnext = nnext->GetNext())->IsNotNullChunk())
+                  {
+                     if (nnext->Is(CT_SEMICOLON))
+                     {
+                        break;
+                     }
+
+                     if (nnext->Is(CT_COLON))
+                     {
+                        nnext->SetType(CT_BIT_COLON);
+                     }
+                  }
+               }
+            }
+            else if (nextprev->Is(CT_FPAREN_CLOSE))
+            {
+               LOG_FMT(LFCN, "%s(%d): nextprev->Text() is '%s', orig line is %zu, orig col is %zu, type is %s\n",
+                       __func__, __LINE__, nextprev->Text(), nextprev->GetOrigLine(), nextprev->GetOrigCol(),
+                       get_token_name(nextprev->GetType()));
+               LOG_FMT(LFCN, "%s(%d): next->Text() is '%s', orig line is %zu, orig col is %zu, type is %s\n",
+                       __func__, __LINE__, next->Text(), next->GetOrigLine(), next->GetOrigCol(),
+                       get_token_name(next->GetType()));
+
+               // Issue #2172
+               if (next->GetParentType() == CT_FUNC_DEF)
+               {
+                  LOG_FMT(LFCN, "%s(%d): it's a construct colon\n", __func__, __LINE__);
+                  // it's a construct colon
+                  next->SetType(CT_CONSTR_COLON);
+               }
+               else
+               {
+                  LOG_FMT(LFCN, "%s(%d): it's a class colon\n", __func__, __LINE__);
+                  // it's a class colon
+                  next->SetType(CT_CLASS_COLON);
+               }
+            }
+            else if (next->GetLevel() > next->GetBraceLevel())
+            {
+               // ignore it, as it is inside a paren
+            }
+            else if (  cur->Is(CT_TYPE)
+                    || cur->Is(CT_ENUM)       // Issue #2584
+                    || nextprev->Is(CT_TYPE)
+                    || nextprev->Is(CT_ENUM)) // Issue #2584
+            {
+               next->SetType(CT_BIT_COLON);
+            }
+            else if (  cur->Is(CT_ENUM)
+                    || cur->Is(CT_ACCESS)
+                    || cur->Is(CT_QUALIFIER)
+                    || cur->GetParentType() == CT_ALIGN)
+            {
+               // ignore it - bit field, align or public/private, etc
+            }
+            else if (  cur->Is(CT_ANGLE_CLOSE)
+                    || hit_class)
+            {
+               // ignore it - template thingy
+            }
+            else if (cur->GetParentType() == CT_SQL_EXEC)
+            {
+               // ignore it - SQL variable name
+            }
+            else if (next->GetParentType() == CT_ASSERT)
+            {
+               // ignore it - Java assert thing
+            }
+            else if (next->GetParentType() == CT_STRUCT)
+            {
+               // ignore it
+            }
+            else
+            {
+               Chunk *tmp = next->GetNextNcNnl();
+
+               //tmp = chunk_get_next_local(next);
+               if (tmp->IsNotNullChunk())
+               {
+                  LOG_FMT(LFCN, "%s(%d): tmp->Text() is '%s', orig line is %zu, orig col is %zu, type is %s\n",
+                          __func__, __LINE__, tmp->Text(), tmp->GetOrigLine(), tmp->GetOrigCol(),
+                          get_token_name(tmp->GetType()));
+
+                  if (  tmp->Is(CT_BASE)
+                     || tmp->Is(CT_THIS))
+                  {
+                     // ignore it, as it is a C# base thingy
+                  }
+                  else if (language_is_set(LANG_CS | LANG_D))
+                  {
+                     // there should be a better solution for that
+                  }
+                  else
+                  {
+                     LOG_FMT(LWARN, "%s(%d): %s:%zu unexpected colon in col %zu n-parent=%s c-parent=%s l=%zu bl=%zu\n",
+                             __func__, __LINE__,
+                             cpd.filename.c_str(), next->GetOrigLine(), next->GetOrigCol(),
+                             get_token_name(next->GetParentType()),
+                             get_token_name(cur->GetParentType()),
+                             next->GetLevel(), next->GetBraceLevel());
+                     exit(EX_SOFTWARE);
+                  }
+               }
+            }
+         }
+      }
+      prev = cur;
+      cur  = next;
+      next = chunk_get_next_local(next);
+   }
+} // combine_labels
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_labels.h
index 4a273d0b..5d5954b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_labels.h
@@ -15,7 +15,7 @@
  * CT_Q_COLON, CT_LABEL_COLON, or CT_CASE_COLON.
  * It also changes the CT_WORD before CT_LABEL_COLON into CT_LABEL.
  */
-void combine_labels(void);
+void combine_labels();
 
 
 #endif /* COMBINE_LABELS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.cpp
new file mode 100644
index 00000000..878941ff
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.cpp
@@ -0,0 +1,242 @@
+/**
+ * @file combine_skip.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ * extract from combine.cpp
+ */
+
+#include "combine_skip.h"
+
+#include "combine_tools.h"
+
+
+Chunk *skip_align(Chunk *start)
+{
+   Chunk *pc = start;
+
+   if (pc->Is(CT_ALIGN))
+   {
+      pc = pc->GetNextNcNnl();
+
+      if (pc->Is(CT_PAREN_OPEN))
+      {
+         pc = pc->GetNextType(CT_PAREN_CLOSE, pc->GetLevel());
+
+         if (pc->IsNotNullChunk())
+         {
+            pc = pc->GetNextNcNnl();
+         }
+
+         if (pc->Is(CT_COLON))
+         {
+            pc = pc->GetNextNcNnl();
+         }
+      }
+   }
+   return(pc);
+}
+
+
+Chunk *skip_expression(Chunk *pc)
+{
+   return(skip_to_expression_end(pc)->GetNextNcNnl());
+}
+
+
+Chunk *skip_expression_rev(Chunk *pc)
+{
+   return(skip_to_expression_start(pc)->GetPrevNcNnlNi());
+}
+
+
+static Chunk *skip_to_expression_edge(Chunk *pc, Chunk *(Chunk::*GetNextFn)(E_Scope scope)const)
+{
+   Chunk *prev = pc;
+
+   if (prev == nullptr)
+   {
+      prev = Chunk::NullChunkPtr;
+   }
+
+   if (prev->IsNotNullChunk())
+   {
+      std::size_t level         = prev->GetLevel();
+      Chunk       *next         = prev;
+      std::size_t template_nest = get_cpp_template_angle_nest_level(prev);
+
+      while (  next->IsNotNullChunk()
+            && next->GetLevel() >= level)
+      {
+         /**
+          * if we encounter a comma or semicolon at the level of the starting chunk,
+          * return the current chunk
+          */
+         if (  next->GetLevel() == level
+            && (  next->Is(CT_COMMA)
+               || next->IsSemicolon()))
+         {
+            break;
+         }
+         /**
+          * check the template nest level; if the current chunk's nest level
+          * is less than that of the starting chunk, return the current chunk
+          */
+         auto next_template_nest = get_cpp_template_angle_nest_level(next);
+
+         if (template_nest > next_template_nest)
+         {
+            break;
+         }
+         prev = next;
+         next = (next->*GetNextFn)(E_Scope::PREPROC);
+      }
+   }
+   return(prev);
+}
+
+
+Chunk *skip_to_expression_end(Chunk *pc)
+{
+   return(skip_to_expression_edge(pc, &Chunk::GetNextNcNnl));
+}
+
+
+Chunk *skip_to_expression_start(Chunk *pc)
+{
+   return(skip_to_expression_edge(pc, &Chunk::GetPrevNcNnlNi));
+}
+
+
+Chunk *skip_to_next_statement(Chunk *pc)
+{
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+
+   while (  pc->IsNotNullChunk()
+         && !pc->IsSemicolon()
+         && pc->IsNot(CT_BRACE_OPEN)
+         && pc->IsNot(CT_BRACE_CLOSE))
+   {
+      pc = pc->GetNextNcNnl();
+   }
+   return(pc);
+}
+
+
+Chunk *skip_template_prev(Chunk *ang_close)
+{
+   if (ang_close->Is(CT_ANGLE_CLOSE))
+   {
+      Chunk *pc = ang_close->GetPrevType(CT_ANGLE_OPEN, ang_close->GetLevel());
+      return(pc->GetPrevNcNnlNi());   // Issue #2279
+   }
+   return(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))
+   {
+      return(ary_def->GetNextNisq());
+   }
+   return(ary_def);
+}
+
+
+Chunk *skip_attribute(Chunk *attr)
+{
+   Chunk *pc = attr;
+
+   while (pc->Is(CT_ATTRIBUTE))
+   {
+      pc = pc->GetNextNcNnl();
+
+      if (pc->Is(CT_FPAREN_OPEN))
+      {
+         pc = pc->GetNextType(CT_FPAREN_CLOSE, pc->GetLevel());
+      }
+   }
+   return(pc);
+}
+
+
+Chunk *skip_attribute_next(Chunk *attr)
+{
+   Chunk *next = skip_attribute(attr);
+
+   if (  next != attr
+      && next->Is(CT_FPAREN_CLOSE))
+   {
+      attr = next->GetNextNcNnl();
+   }
+
+   if (attr == nullptr)
+   {
+      return(Chunk::NullChunkPtr);
+   }
+   return(attr);
+}
+
+
+Chunk *skip_attribute_prev(Chunk *fp_close)
+{
+   Chunk *pc = fp_close;
+
+   while (true)
+   {
+      if (  pc->Is(CT_FPAREN_CLOSE)
+         && pc->GetParentType() == CT_ATTRIBUTE)
+      {
+         pc = pc->GetPrevType(CT_ATTRIBUTE, pc->GetLevel());
+      }
+      else if (pc->IsNot(CT_ATTRIBUTE))
+      {
+         break;
+      }
+      pc = pc->GetPrevNcNnlNi(); // Issue #2279
+
+      if (pc->IsNullChunk())     // Issue #3356
+      {
+         break;
+      }
+   }
+   return(pc);
+}
+
+
+Chunk *skip_declspec(Chunk *pc)
+{
+   if (pc->Is(CT_DECLSPEC))
+   {
+      pc = pc->GetNextNcNnl();
+
+      if (pc->Is(CT_PAREN_OPEN))
+      {
+         pc = pc->GetClosingParen();
+      }
+   }
+   return(pc);
+}
+
+
+Chunk *skip_declspec_next(Chunk *pc)
+{
+   Chunk *next = skip_declspec(pc);
+
+   if (  next != pc
+      && next->Is(CT_PAREN_CLOSE))
+   {
+      pc = next->GetNextNcNnl();
+   }
+   return(pc);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.h
index b1595647..8bd9134e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.h
@@ -68,12 +68,6 @@ Chunk *skip_to_expression_start(Chunk *pc);
 
 
 /**
- * Skips the list of class/struct parent types.
- */
-Chunk *skip_parent_types(Chunk *colon);
-
-
-/**
  * Skips over the rest of the template if ang_open is indeed a CT_ANGLE_OPEN.
  * Points to the chunk after the CT_ANGLE_CLOSE.
  * If the chunk isn't an CT_ANGLE_OPEN, then it is returned.
@@ -140,30 +134,4 @@ Chunk *skip_declspec(Chunk *pc);
 Chunk *skip_declspec_next(Chunk *pc);
 
 
-/**
- * If pc is a CT_FPAREN_CLOSE with a parent of CT_DECLSPEC, then skip it
- * and the '__declspec' keyword and return the chunk before CT_DECLSPEC.
- * Otherwise return pc.
- */
-Chunk *skip_declspec_prev(Chunk *pc);
-
-
-/**
- * If pc is a CT_BRACE_OPEN, CT_PAREN_OPEN or CT_SQUARE_OPEN, then skip
- * forward to the next non-comment/non-newline chunk following the matching
- * CT_BRACE_CLOSE, CT_PAREN_CLOSE or CT_SQUARE_CLOSE; if pc is none of these
- * upon calling this function, then pc is returned.
- */
-Chunk *skip_matching_brace_bracket_paren_next(Chunk *pc);
-
-
-/**
- * If pc is a CT_BRACE_CLOSE, CT_PAREN_CLOSE or CT_SQUARE_CLOSE, then skip
- * in reverse to the first non-comment/non-newline chunk preceding the matching
- * CT_BRACE_OPEN, CT_PAREN_OPEN or CT_SQUARE_OPEN; if pc is none of these upon
- * calling this function, then pc is returned.
- */
-Chunk *skip_to_chunk_before_matching_brace_bracket_paren_rev(Chunk *pc);
-
-
 #endif /* COMBINE_SKIP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_tools.cpp
index b6866e00..7adafe68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_tools.cpp
@@ -17,9 +17,9 @@ bool can_be_full_param(Chunk *start, Chunk *end)
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LFPARAM, "%s(%d): start->Text() is '%s', type is %s\n",
-           __func__, __LINE__, start->Text(), get_token_name(start->type));
+           __func__, __LINE__, start->Text(), get_token_name(start->GetType()));
    LOG_FMT(LFPARAM, "%s(%d): end->Text()   is '%s', type is %s\n",
-           __func__, __LINE__, end->Text(), get_token_name(end->type));
+           __func__, __LINE__, end->Text(), get_token_name(end->GetType()));
 
    int   word_count     = 0;
    int   type_count     = 0;
@@ -32,21 +32,21 @@ bool can_be_full_param(Chunk *start, Chunk *end)
         pc = pc->GetNextNcNnl(E_Scope::PREPROC))
    {
       LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
 
-      if (  chunk_is_token(pc, CT_QUALIFIER)
-         || chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_ENUM)
-         || chunk_is_token(pc, CT_UNION)
-         || chunk_is_token(pc, CT_TYPENAME))
+      if (  pc->Is(CT_QUALIFIER)
+         || pc->Is(CT_STRUCT)
+         || pc->Is(CT_ENUM)
+         || pc->Is(CT_UNION)
+         || pc->Is(CT_TYPENAME))
       {
          LOG_FMT(LFPARAM, "%s(%d): <== %s! (yes)\n",
-                 __func__, __LINE__, get_token_name(pc->type));
+                 __func__, __LINE__, get_token_name(pc->GetType()));
          return(true);
       }
 
-      if (  chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_TYPE))
+      if (  pc->Is(CT_WORD)
+         || pc->Is(CT_TYPE))
       {
          ++word_count;
 
@@ -56,13 +56,13 @@ bool can_be_full_param(Chunk *start, Chunk *end)
             first_word_set = true;
          }
 
-         if (chunk_is_token(pc, CT_TYPE))
+         if (pc->Is(CT_TYPE))
          {
             ++type_count;
          }
       }
-      else if (  chunk_is_token(pc, CT_MEMBER)
-              || chunk_is_token(pc, CT_DC_MEMBER))
+      else if (  pc->Is(CT_MEMBER)
+              || pc->Is(CT_DC_MEMBER))
       {
          if (word_count > 0)
          {
@@ -70,36 +70,36 @@ bool can_be_full_param(Chunk *start, Chunk *end)
          }
       }
       else if (  pc != start
-              && chunk_is_ptr_operator(pc))
+              && pc->IsPointerOperator())
       {
          // chunk is OK
       }
-      else if (chunk_is_token(pc, CT_ASSIGN))
+      else if (pc->Is(CT_ASSIGN))
       {
          // chunk is OK (default values)
          break;
       }
-      else if (chunk_is_token(pc, CT_ANGLE_OPEN))
+      else if (pc->Is(CT_ANGLE_OPEN))
       {
          LOG_FMT(LFPARAM, "%s(%d): <== template\n",
                  __func__, __LINE__);
 
          return(true);
       }
-      else if (chunk_is_token(pc, CT_ELLIPSIS))
+      else if (pc->Is(CT_ELLIPSIS))
       {
-         LOG_FMT(LFPARAM, "%s(%d): <== elipses\n",
+         LOG_FMT(LFPARAM, "%s(%d): <== ellipsis\n",
                  __func__, __LINE__);
 
          return(true);
       }
       else if (  word_count == 0
-              && chunk_is_token(pc, CT_PAREN_OPEN))
+              && pc->Is(CT_PAREN_OPEN))
       {
          // Check for old-school func proto param '(type)'
-         Chunk *tmp1 = chunk_skip_to_match(pc, E_Scope::PREPROC);
+         Chunk *tmp1 = pc->GetClosingParen(E_Scope::PREPROC);
 
-         if (tmp1 == nullptr)
+         if (tmp1->IsNullChunk())
          {
             return(false);
          }
@@ -110,8 +110,8 @@ bool can_be_full_param(Chunk *start, Chunk *end)
             return(false);
          }
 
-         if (  chunk_is_token(tmp2, CT_COMMA)
-            || chunk_is_paren_close(tmp2))
+         if (  tmp2->Is(CT_COMMA)
+            || tmp2->IsParenClose())
          {
             do
             {
@@ -122,7 +122,7 @@ bool can_be_full_param(Chunk *start, Chunk *end)
                   return(false);
                }
                LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+                       __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
             } while (pc != tmp1);
 
             // reset some vars to allow [] after parens
@@ -132,13 +132,13 @@ bool can_be_full_param(Chunk *start, Chunk *end)
          else
          {
             LOG_FMT(LFPARAM, "%s(%d): <== '%s' not fcn type!\n",
-                    __func__, __LINE__, get_token_name(pc->type));
+                    __func__, __LINE__, get_token_name(pc->GetType()));
             return(false);
          }
       }
       else if (  (  word_count == 1
                  || (word_count == type_count))
-              && chunk_is_token(pc, CT_PAREN_OPEN))
+              && pc->Is(CT_PAREN_OPEN))
       {
          // Check for func proto param 'void (*name)' or 'void (*name)(params)' or 'void (^name)(params)'
          // <name> can be optional
@@ -150,25 +150,33 @@ bool can_be_full_param(Chunk *start, Chunk *end)
          }
          Chunk *tmp2 = tmp1->GetNextNcNnl(E_Scope::PREPROC);
 
+         if (tmp2->Is(CT_QUALIFIER))
+         {
+            // tmp2 is the "nullable" qualifier in this case:
+            // void (^nullable name)(params)
+            // skip the qualifier
+            tmp2 = tmp2->GetNextNcNnl(E_Scope::PREPROC);
+         }
+
          if (tmp2->IsNullChunk())
          {
             return(false);
          }
-         Chunk *tmp3 = (chunk_is_str(tmp2, ")")) ? tmp2 : tmp2->GetNextNcNnl(E_Scope::PREPROC);
+         Chunk *tmp3 = (tmp2->IsString(")")) ? tmp2 : tmp2->GetNextNcNnl(E_Scope::PREPROC);
 
          if (tmp3->IsNullChunk())
          {
             return(false);
          }
 
-         if (  !chunk_is_str(tmp3, ")")
-            || !(  chunk_is_str(tmp1, "*")
-                || chunk_is_str(tmp1, "^")) // Issue #2656
-            || !(  tmp2->type == CT_WORD
-                || chunk_is_str(tmp2, ")")))
+         if (  !tmp3->IsString(")")
+            || !(  tmp1->IsString("*")
+                || tmp1->IsString("^")) // Issue #2656
+            || !(  tmp2->GetType() == CT_WORD
+                || tmp2->IsString(")")))
          {
             LOG_FMT(LFPARAM, "%s(%d): <== '%s' not fcn type!\n",
-                    __func__, __LINE__, get_token_name(pc->type));
+                    __func__, __LINE__, get_token_name(pc->GetType()));
             return(false);
          }
          LOG_FMT(LFPARAM, "%s(%d): <skip fcn type>\n",
@@ -181,98 +189,99 @@ bool can_be_full_param(Chunk *start, Chunk *end)
             return(false);
          }
 
-         if (chunk_is_str(tmp1, "("))
+         if (tmp1->IsString("("))
          {
-            tmp3 = chunk_skip_to_match(tmp1, E_Scope::PREPROC);
+            tmp3 = tmp1->GetClosingParen(E_Scope::PREPROC);
          }
          pc = tmp3;
          LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+                 __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
 
          // reset some vars to allow [] after parens
          word_count = 1;
          type_count = 1;
       }
-      else if (chunk_is_token(pc, CT_TSQUARE))
+      else if (pc->Is(CT_TSQUARE))
       {
          // ignore it
       }
       else if (  word_count == 1
-              && chunk_is_token(pc, CT_SQUARE_OPEN))
+              && pc->Is(CT_SQUARE_OPEN))
       {
          // skip over any array stuff
-         pc = chunk_skip_to_match(pc, E_Scope::PREPROC);
+         pc = pc->GetClosingParen(E_Scope::PREPROC);
          LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+                 __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
       }
       else if (  word_count == 2
-              && chunk_is_token(pc, CT_SQUARE_OPEN))
+              && pc->Is(CT_SQUARE_OPEN))
       {
          // Bug #671: is it such as: bool foo[FOO_MAX]
-         pc = chunk_skip_to_match(pc, E_Scope::PREPROC);
+         pc = pc->GetClosingParen(E_Scope::PREPROC);
          LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+                 __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
       }
       else if (  word_count == 1
               && language_is_set(LANG_CPP)
-              && chunk_is_str(pc, "&&"))
+              && pc->IsString("&&"))
       {
          // ignore possible 'move' operator
       }
       else
       {
          LOG_FMT(LFPARAM, "%s(%d): <== type is %s, no way!, type count is %d, word count is %d\n",
-                 __func__, __LINE__, get_token_name(pc->type), type_count, word_count);
+                 __func__, __LINE__, get_token_name(pc->GetType()), type_count, word_count);
          return(false);
       }
       LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()));
    }
 
    Chunk *last = pc->GetPrevNcNnlNi();   // Issue #2279
 
    LOG_FMT(LFPARAM, "%s(%d): last->Text() is '%s', type is %s\n",
-           __func__, __LINE__, last->Text(), get_token_name(last->type));
+           __func__, __LINE__, last->Text(), get_token_name(last->GetType()));
 
-   if (chunk_is_ptr_operator(last))
+   if (last->IsPointerOperator())
    {
       LOG_FMT(LFPARAM, "%s(%d): <== type is %s, sure!\n",
-              __func__, __LINE__, get_token_name(last->type));
+              __func__, __LINE__, get_token_name(last->GetType()));
       return(true);
    }
 
    if (  word_count < 2
       && type_count < 1
-      && start->brace_level > 0)
+      && start->GetBraceLevel() > 0)
    {
       LOG_FMT(LFPARAM, "%s(%d): !MVP!\n",
               __func__, __LINE__);
       // Oh, joy, we are in Most Vexing Parse territory
       Chunk *brace =
-         start->GetPrevType(CT_BRACE_OPEN, start->brace_level - 1);
+         start->GetPrevType(CT_BRACE_OPEN, start->GetBraceLevel() - 1);
 
       if (brace->IsNotNullChunk())
       {
-         LOG_FMT(LFPARAM, "%s(%d): (matching %s brace at orig_line %zu, orig_col is %zu)",
+         LOG_FMT(LFPARAM, "%s(%d): (matching %s brace at orig line %zu, orig col is %zu)",
                  __func__, __LINE__,
-                 get_token_name(get_chunk_parent_type(brace)), brace->orig_line, brace->orig_col);
+                 get_token_name(brace->GetParentType()), brace->GetOrigLine(), brace->GetOrigCol());
       }
 
       if (  brace->IsNotNullChunk()
-         && (  get_chunk_parent_type(brace) == CT_CLASS
-            || get_chunk_parent_type(brace) == CT_STRUCT))
+         && (  brace->GetParentType() == CT_CLASS
+            || brace->GetParentType() == CT_STRUCT))
       {
          // A Most Vexing Parse variable declaration cannot occur in the body
          // of a struct/class, so we probably have a function prototype
          LOG_FMT(LFPARAM, "%s(%d): <== type is %s, Likely!\n",
-                 __func__, __LINE__, (pc == nullptr ? "nullptr" : get_token_name(pc->type)));
+                 __func__, __LINE__, (pc == nullptr ? "nullptr" : 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)
+   if (  first_word != nullptr
+      && first_word->IsNotNullChunk())
    {
       LOG_FMT(LFPARAM, "%s(%d): first_word->Text() is '%s'\n",
               __func__, __LINE__, first_word->Text());
@@ -287,7 +296,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->type)));
+           (pc == nullptr ? "nullptr" : get_token_name(pc->GetType())));
 
    if (ret)
    {
@@ -310,7 +319,7 @@ bool chunk_ends_type(Chunk *start)
    bool   last_expr = false;
    bool   last_lval = false;
 
-   bool   a = pc->flags.test(PCF_IN_FCN_CTOR);
+   bool   a = pc->TestFlags(PCF_IN_FCN_CTOR);
 
    if (a)
    {
@@ -319,30 +328,30 @@ bool chunk_ends_type(Chunk *start)
 
    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   ",
-              __func__, __LINE__, get_token_name(pc->type), pc->Text(),
-              pc->orig_line, pc->orig_col);
-      log_pcf_flags(LFTYPE, pc->flags);
-
-      if (  chunk_is_token(pc, CT_WORD)
-         || chunk_is_token(pc, CT_TYPE)
-         || chunk_is_token(pc, CT_PTR_TYPE)
-         || chunk_is_token(pc, CT_STAR)
-         || chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_DC_MEMBER)
-         || chunk_is_token(pc, CT_PP)
-         || chunk_is_token(pc, CT_QUALIFIER)
+      LOG_FMT(LFTYPE, "%s(%d): type is %s, Text() '%s', orig line %zu, orig col %zu\n   ",
+              __func__, __LINE__, get_token_name(pc->GetType()), pc->Text(),
+              pc->GetOrigLine(), pc->GetOrigCol());
+      log_pcf_flags(LFTYPE, pc->GetFlags());
+
+      if (  pc->Is(CT_WORD)
+         || pc->Is(CT_TYPE)
+         || pc->Is(CT_PTR_TYPE)
+         || pc->Is(CT_STAR)
+         || pc->Is(CT_STRUCT)
+         || pc->Is(CT_DC_MEMBER)
+         || pc->Is(CT_PP)
+         || pc->Is(CT_QUALIFIER)
          || (  language_is_set(LANG_CPP | LANG_OC)                       // Issue #2727
-            && get_chunk_parent_type(pc) == CT_TEMPLATE
-            && (  chunk_is_token(pc, CT_ANGLE_OPEN)
-               || chunk_is_token(pc, CT_ANGLE_CLOSE)))
+            && pc->GetParentType() == CT_TEMPLATE
+            && (  pc->Is(CT_ANGLE_OPEN)
+               || pc->Is(CT_ANGLE_CLOSE)))
          || (  language_is_set(LANG_CS | LANG_VALA)
-            && (chunk_is_token(pc, CT_MEMBER))))
+            && (pc->Is(CT_MEMBER))))
       {
          cnt++;
-         last_expr = pc->flags.test(PCF_EXPR_START)
-                     && !pc->flags.test(PCF_IN_FCN_CALL);
-         last_lval = pc->flags.test(PCF_LVALUE);
+         last_expr = pc->TestFlags(PCF_EXPR_START)
+                     && !pc->TestFlags(PCF_IN_FCN_CALL);
+         last_lval = pc->TestFlags(PCF_LVALUE);
          continue;
       }
       /* If a comma is encountered within a template, it must be
@@ -350,25 +359,24 @@ bool chunk_ends_type(Chunk *start)
        * template (i.e. argument list nest level)
        */
 
-      if (  (  chunk_is_semicolon(pc)
-            && !pc->flags.test(PCF_IN_FOR))
-         || chunk_is_token(pc, CT_TYPEDEF)
-         || chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE)
-         || chunk_is_token(pc, CT_FPAREN_CLOSE)
-         || chunk_is_forin(pc)
-         || chunk_is_token(pc, CT_MACRO)
-         || chunk_is_token(pc, CT_PP_IF)
-         || chunk_is_token(pc, CT_PP_ELSE)
-         || chunk_is_token(pc, CT_PP_ENDIF)
-         || get_chunk_parent_type(pc) == CT_PP_INCLUDE                       // Issue #3233
-         || (  (  chunk_is_token(pc, CT_COMMA)
-               && !pc->flags.test(PCF_IN_FCN_CALL)
+      if (  (  pc->IsSemicolon()
+            && !pc->TestFlags(PCF_IN_FOR))
+         || pc->Is(CT_TYPEDEF)
+         || pc->Is(CT_BRACE_OPEN)
+         || pc->IsBraceClose()
+         || pc->Is(CT_FPAREN_CLOSE)
+         || pc->IsOCForinOpenParen()
+         || pc->Is(CT_MACRO)
+         || pc->Is(CT_PP_IF)
+         || pc->Is(CT_PP_ELSE)
+         || pc->Is(CT_PP_ENDIF)
+         || pc->GetParentType() == CT_PP_INCLUDE                       // Issue #3233
+         || (  (  pc->Is(CT_COMMA)
+               && !pc->TestFlags(PCF_IN_FCN_CALL)
                && get_cpp_template_angle_nest_level(start) ==
                   get_cpp_template_angle_nest_level(pc))
             && last_expr)
-         || (  chunk_is_token(pc, CT_SPAREN_OPEN)
+         || (  pc->Is(CT_SPAREN_OPEN)
             && last_lval))
       {
          ret = cnt > 0;
@@ -394,7 +402,7 @@ bool chunkstack_match(ChunkStack &cs, Chunk *pc)
    {
       Chunk *tmp = cs.GetChunk(idx);
 
-      if (pc->str.equals(tmp->str))
+      if (pc->GetStr().equals(tmp->GetStr()))
       {
          return(true);
       }
@@ -404,7 +412,7 @@ bool chunkstack_match(ChunkStack &cs, Chunk *pc)
 } // chunkstack_match
 
 
-void flag_series(Chunk *start, Chunk *end, pcf_flags_t set_flags, pcf_flags_t clr_flags, E_Scope nav)
+void flag_series(Chunk *start, Chunk *end, T_PcfFlags set_flags, T_PcfFlags clr_flags, E_Scope nav)
 {
    LOG_FUNC_ENTRY();
 
@@ -412,7 +420,8 @@ void flag_series(Chunk *start, Chunk *end, pcf_flags_t set_flags, pcf_flags_t cl
          && start->IsNotNullChunk()
          && start != end)
    {
-      chunk_flags_upd(start, clr_flags, set_flags);
+      start->UpdateFlagBits(clr_flags, set_flags);
+      log_pcf_flags(LGUY, start->GetFlags());
 
       start = start->GetNext(nav);
 
@@ -425,7 +434,8 @@ void flag_series(Chunk *start, Chunk *end, pcf_flags_t set_flags, pcf_flags_t cl
    if (  end != nullptr
       && end->IsNotNullChunk())
    {
-      chunk_flags_upd(end, clr_flags, set_flags);
+      end->UpdateFlagBits(clr_flags, set_flags);
+      log_pcf_flags(LGUY, end->GetFlags());
    }
 } // flag_series
 
@@ -441,15 +451,15 @@ size_t get_cpp_template_angle_nest_level(Chunk *pc)
    }
 
    while (  pc->IsNotNullChunk()
-         && pc->flags.test(PCF_IN_TEMPLATE))
+         && pc->TestFlags(PCF_IN_TEMPLATE))
    {
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         && get_chunk_parent_type(pc) == CT_TEMPLATE)
+      if (  pc->Is(CT_ANGLE_CLOSE)
+         && pc->GetParentType() == CT_TEMPLATE)
       {
          --nestLevel;
       }
-      else if (  chunk_is_token(pc, CT_ANGLE_OPEN)
-              && get_chunk_parent_type(pc) == CT_TEMPLATE)
+      else if (  pc->Is(CT_ANGLE_OPEN)
+              && pc->GetParentType() == CT_TEMPLATE)
       {
          ++nestLevel;
       }
@@ -466,10 +476,10 @@ Chunk *get_d_template_types(ChunkStack &cs, Chunk *open_paren)
    bool  maybe_type = true;
 
    while (  tmp->IsNullChunk()
-         && tmp->level > open_paren->level)
+         && tmp->GetLevel() > open_paren->GetLevel())
    {
-      if (  chunk_is_token(tmp, CT_TYPE)
-         || chunk_is_token(tmp, CT_WORD))
+      if (  tmp->Is(CT_TYPE)
+         || tmp->Is(CT_WORD))
       {
          if (maybe_type)
          {
@@ -478,7 +488,7 @@ Chunk *get_d_template_types(ChunkStack &cs, Chunk *open_paren)
          }
          maybe_type = false;
       }
-      else if (chunk_is_token(tmp, CT_COMMA))
+      else if (tmp->Is(CT_COMMA))
       {
          maybe_type = true;
       }
@@ -492,17 +502,17 @@ bool go_on(Chunk *pc, Chunk *start)
 {
    if (  pc == nullptr
       || pc->IsNullChunk()
-      || pc->level != start->level)
+      || pc->GetLevel() != start->GetLevel())
    {
       return(false);
    }
 
-   if (pc->flags.test(PCF_IN_FOR))
+   if (pc->TestFlags(PCF_IN_FOR))
    {
-      return(  (!chunk_is_semicolon(pc))
-            && (!(chunk_is_token(pc, CT_COLON))));
+      return(  (!pc->IsSemicolon())
+            && (!(pc->Is(CT_COLON))));
    }
-   return(!chunk_is_semicolon(pc));
+   return(!pc->IsSemicolon());
 } // go_on
 
 
@@ -524,44 +534,45 @@ void make_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc != nullptr)
+   if (  pc != nullptr
+      && pc->IsNotNullChunk())
    {
-      if (chunk_is_token(pc, CT_WORD))
+      if (pc->Is(CT_WORD))
       {
-         set_chunk_type(pc, CT_TYPE);
+         pc->SetType(CT_TYPE);
       }
       else if (  (  pc->IsStar()
-                 || chunk_is_msref(pc)
-                 || chunk_is_nullable(pc))
-              && chunk_is_type(pc->prev))                              // Issue # 2640
+                 || pc->IsMsRef()
+                 || pc->IsNullable())
+              && pc->GetPrev()->IsTypeDefinition())               // Issue # 2640
       {
-         set_chunk_type(pc, CT_PTR_TYPE);
+         pc->SetType(CT_PTR_TYPE);
       }
-      else if (  chunk_is_addr(pc)
-              && !chunk_is_token(pc->prev, CT_SQUARE_OPEN))            // Issue # 2166
+      else if (  pc->IsAddress()
+              && pc->GetPrev()->IsNot(CT_SQUARE_OPEN))            // Issue # 2166
       {
-         set_chunk_type(pc, CT_BYREF);
+         pc->SetType(CT_BYREF);
       }
    }
 } // make_type
 
 
-Chunk *set_paren_parent(Chunk *start, E_Token parent)
+Chunk *set_paren_parent(Chunk *start, E_Token parent_type)
 {
    LOG_FUNC_ENTRY();
    Chunk *end;
 
-   end = chunk_skip_to_match(start, E_Scope::PREPROC);
+   end = start->GetClosingParen(E_Scope::PREPROC);
 
-   if (end != nullptr)
+   if (end->IsNotNullChunk())
    {
-      LOG_FMT(LFLPAREN, "%s(%d): %zu:%zu '%s' and %zu:%zu '%s' type is %s, parent_type is %s",
-              __func__, __LINE__, start->orig_line, start->orig_col, start->Text(),
-              end->orig_line, end->orig_col, end->Text(),
-              get_token_name(start->type), get_token_name(parent));
+      LOG_FMT(LFLPAREN, "%s(%d): %zu:%zu '%s' and %zu:%zu '%s' type is %s, parent type is %s",
+              __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol(), start->Text(),
+              end->GetOrigLine(), end->GetOrigCol(), end->Text(),
+              get_token_name(start->GetType()), get_token_name(parent_type));
       log_func_stack_inline(LFLPAREN);
-      set_chunk_parent(start, parent);
-      set_chunk_parent(end, parent);
+      start->SetParentType(parent_type);
+      end->SetParentType(parent_type);
       LOG_FMT(LFLPAREN, "%s(%d):\n", __func__, __LINE__);
       return(end->GetNextNcNnl(E_Scope::PREPROC));
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_tools.h
index 40ea915f..e18fe92a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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, pcf_flags_t set_flags, pcf_flags_t clr_flags = {}, E_Scope nav = E_Scope::ALL);
+void flag_series(Chunk *start, Chunk *end, T_PcfFlags set_flags, T_PcfFlags clr_flags = {}, E_Scope nav = E_Scope::ALL);
 
 
 /*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat.h
index 32fce459..32fce459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_posix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_posix.cpp
index c77c7a89..c77c7a89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_posix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_posix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_win32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_win32.cpp
index e1617876..e1617876 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_win32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_win32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/config.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/config.h.in
index 4270a733..420de635 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/config.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/config.h.in
@@ -84,7 +84,7 @@
 // Version number of package
 #cmakedefine VERSION "@VERSION@"
 
-/* Define to appropriate substitue if compiler doesnt have __func__ */
+/* Define to appropriate substitute if compiler doesn't have __func__ */
 /* #undef __func__ */
 
 /* Define to empty if `const' does not conform to ANSI C. */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.cpp
index 4fd2fd66..b9b5b958 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.cpp
@@ -13,8 +13,8 @@
 
 bool cs_top_is_question(ChunkStack &cs, size_t level)
 {
-   Chunk *pc = cs.Empty() ? nullptr : cs.Top()->m_pc;
+   Chunk *pc = cs.Empty() ? Chunk::NullChunkPtr : cs.Top()->m_pc;
 
-   return(  chunk_is_token(pc, CT_QUESTION)
-         && pc->level == level);
+   return(  pc->Is(CT_QUESTION)
+         && pc->GetLevel() == level);
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.h
index de6ace3e..de6ace3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.cpp
index b7fc17ca..ec718e81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.cpp
@@ -15,7 +15,7 @@ using namespace uncrustify;
 
 
 //! Detect spacing options
-static void detect_space_options(void);
+static void detect_space_options();
 
 
 class sp_votes
@@ -41,13 +41,13 @@ public:
 void sp_votes::vote(Chunk *first, Chunk *second)
 {
    if (  first == nullptr
-      || chunk_is_newline(first)
+      || first->IsNewline()
       || second == nullptr
-      || chunk_is_newline(second))
+      || second->IsNewline())
    {
       return;
    }
-   int col_dif = second->column - (first->column + first->Len());
+   int col_dif = second->GetColumn() - (first->GetColumn() + first->Len());
 
    if (col_dif == 0)
    {
@@ -95,7 +95,7 @@ sp_votes::~sp_votes()
 #define SP_VOTE_VAR(x)    sp_votes vote_ ## x(options::x)
 
 
-static void detect_space_options(void)
+static void detect_space_options()
 {
    SP_VOTE_VAR(sp_arith);
    SP_VOTE_VAR(sp_before_assign);
@@ -161,16 +161,16 @@ static void detect_space_options(void)
          break;
       }
 
-      if (  chunk_is_token(pc, CT_ARITH)
-         || chunk_is_token(pc, CT_SHIFT))
+      if (  pc->Is(CT_ARITH)
+         || pc->Is(CT_SHIFT))
       {
          vote_sp_arith.vote(pc, next);
          vote_sp_arith.vote(prev, pc);
       }
 
-      if (chunk_is_token(pc, CT_ASSIGN))
+      if (pc->Is(CT_ASSIGN))
       {
-         if (!pc->flags.test(PCF_IN_ENUM))
+         if (!pc->TestFlags(PCF_IN_ENUM))
          {
             vote_sp_before_assign.vote(prev, pc);
             vote_sp_after_assign.vote(pc, next);
@@ -182,65 +182,65 @@ static void detect_space_options(void)
          }
       }
 
-      if (chunk_is_token(pc, CT_SQUARE_OPEN))
+      if (pc->Is(CT_SQUARE_OPEN))
       {
          vote_sp_before_square.vote(prev, pc);
          vote_sp_inside_square.vote(pc, next);
       }
 
-      if (chunk_is_token(pc, CT_SQUARE_CLOSE))
+      if (pc->Is(CT_SQUARE_CLOSE))
       {
          vote_sp_inside_square.vote(prev, pc);
       }
 
-      if (chunk_is_token(pc, CT_TSQUARE))
+      if (pc->Is(CT_TSQUARE))
       {
          vote_sp_before_squares.vote(prev, pc);
       }
 
-      if (chunk_is_token(pc, CT_BOOL))
+      if (pc->Is(CT_BOOL))
       {
          vote_sp_bool.vote(prev, pc);
          vote_sp_bool.vote(pc, next);
       }
 
-      if (chunk_is_token(pc, CT_COMPARE))
+      if (pc->Is(CT_COMPARE))
       {
          vote_sp_compare.vote(prev, pc);
          vote_sp_compare.vote(pc, next);
       }
 
-      if (chunk_is_token(pc, CT_PAREN_CLOSE))
+      if (pc->Is(CT_PAREN_CLOSE))
       {
          vote_sp_inside_paren.vote(prev, pc);
       }
 
-      if (chunk_is_token(pc, CT_PAREN_OPEN))
+      if (pc->Is(CT_PAREN_OPEN))
       {
          vote_sp_inside_paren.vote(pc, next);
       }
 
-      if (  (  chunk_is_paren_open(pc)
-            && chunk_is_paren_open(next))
-         || (  chunk_is_paren_close(pc)
-            && chunk_is_paren_close(next)))
+      if (  (  pc->IsParenOpen()
+            && next->IsParenOpen())
+         || (  pc->IsParenClose()
+            && next->IsParenClose()))
       {
          vote_sp_paren_paren.vote(pc, next);
       }
 
-      if (  chunk_is_paren_close(pc)
-         && chunk_is_token(next, CT_BRACE_OPEN))
+      if (  pc->IsParenClose()
+         && next->Is(CT_BRACE_OPEN))
       {
          vote_sp_paren_brace.vote(pc, next);
       }
 
-      if (chunk_is_token(pc, CT_PTR_TYPE))
+      if (pc->Is(CT_PTR_TYPE))
       {
-         if (chunk_is_token(prev, CT_PTR_TYPE))
+         if (prev->Is(CT_PTR_TYPE))
          {
             vote_sp_between_ptr_star.vote(prev, pc);
          }
-         else if (next->type != CT_WORD)
+         else if (next->IsNot(CT_WORD))
          {
             vote_sp_before_unnamed_ptr_star.vote(prev, pc);
          }
@@ -249,15 +249,15 @@ static void detect_space_options(void)
             vote_sp_before_ptr_star.vote(prev, pc);
          }
 
-         if (CharTable::IsKw1(next->str[0]))
+         if (CharTable::IsKw1(next->GetStr()[0]))
          {
             vote_sp_after_ptr_star.vote(pc, next);
          }
       }
 
-      if (chunk_is_token(pc, CT_BYREF))
+      if (pc->Is(CT_BYREF))
       {
-         if (next->type != CT_WORD)
+         if (next->IsNot(CT_WORD))
          {
             vote_sp_before_unnamed_byref.vote(prev, pc);
          }
@@ -268,18 +268,18 @@ static void detect_space_options(void)
          vote_sp_after_byref.vote(pc, next);
       }
 
-      if (  pc->type != CT_PTR_TYPE
-         && (  chunk_is_token(prev, CT_QUALIFIER)
-            || chunk_is_token(prev, CT_TYPE)))
+      if (  pc->IsNot(CT_PTR_TYPE)
+         && (  prev->Is(CT_QUALIFIER)
+            || prev->Is(CT_TYPE)))
       {
          vote_sp_after_type.vote(prev, pc);
       }
 
-      if (chunk_is_token(pc, CT_ANGLE_OPEN))
+      if (pc->Is(CT_ANGLE_OPEN))
       {
          vote_sp_inside_angle.vote(pc, next);
 
-         if (chunk_is_token(prev, CT_TEMPLATE))
+         if (prev->Is(CT_TEMPLATE))
          {
             vote_sp_template_angle.vote(prev, pc);
          }
@@ -289,16 +289,16 @@ static void detect_space_options(void)
          }
       }
 
-      if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+      if (pc->Is(CT_ANGLE_CLOSE))
       {
          vote_sp_inside_angle.vote(prev, pc);
 
-         if (chunk_is_paren_open(next))
+         if (next->IsParenOpen())
          {
             vote_sp_angle_paren.vote(prev, pc);
          }
-         else if (  chunk_is_token(next, CT_WORD)
-                 || CharTable::IsKw1(next->str[0]))
+         else if (  next->Is(CT_WORD)
+                 || CharTable::IsKw1(next->GetStr()[0]))
          {
             vote_sp_angle_word.vote(prev, pc);
          }
@@ -308,17 +308,17 @@ static void detect_space_options(void)
          }
       }
 
-      if (chunk_is_token(pc, CT_SPAREN_OPEN))
+      if (pc->Is(CT_SPAREN_OPEN))
       {
          vote_sp_before_sparen.vote(prev, pc);
          vote_sp_inside_sparen.vote(pc, next);
       }
 
-      if (chunk_is_token(pc, CT_SPAREN_CLOSE))
+      if (pc->Is(CT_SPAREN_CLOSE))
       {
          vote_sp_inside_sparen.vote(prev, pc);
 
-         if (chunk_is_token(next, CT_BRACE_OPEN))
+         if (next->Is(CT_BRACE_OPEN))
          {
             vote_sp_sparen_brace.vote(pc, next);
          }
@@ -328,25 +328,25 @@ static void detect_space_options(void)
          }
       }
 
-      if (chunk_is_token(pc, CT_SEMICOLON))
+      if (pc->Is(CT_SEMICOLON))
       {
-         if (get_chunk_parent_type(pc) == CT_FOR)
+         if (pc->GetParentType() == CT_FOR)
          {
-            if (chunk_is_token(prev, CT_SPAREN_OPEN))
+            if (prev->Is(CT_SPAREN_OPEN))
             {
                // empty, ie for (;;)
                //               ^ is prev
                //                ^ is pc
                vote_sp_before_semi_for_empty.vote(prev, pc);
             }
-            else if (chunk_is_token(next, CT_SPAREN_CLOSE))
+            else if (next->Is(CT_SPAREN_CLOSE))
             {
                // empty, ie for (;;)
                //                 ^ is pc
                //                  ^ is next
                vote_sp_after_semi_for_empty.vote(pc, next);
             }
-            else if (prev->type != CT_SEMICOLON)
+            else if (prev->IsNot(CT_SEMICOLON))
             {
                // empty, ie for (; i < 8;)
                //                       ^ is pc
@@ -355,7 +355,7 @@ static void detect_space_options(void)
                vote_sp_before_semi_for.vote(prev, pc);
             }
          }
-         else if (chunk_is_token(prev, CT_VBRACE_OPEN))
+         else if (prev->Is(CT_VBRACE_OPEN))
          {
             vote_sp_special_semi.vote(prev->GetPrev(), pc);
          }
@@ -365,42 +365,42 @@ static void detect_space_options(void)
          }
       }
 
-      if (chunk_is_token(pc, CT_COMMA))
+      if (pc->Is(CT_COMMA))
       {
          vote_sp_before_comma.vote(prev, pc);
          vote_sp_after_comma.vote(pc, next);
       }
 
-      if (chunk_is_token(pc, CT_CLASS_COLON))
+      if (pc->Is(CT_CLASS_COLON))
       {
          vote_sp_before_class_colon.vote(prev, pc);
          vote_sp_after_class_colon.vote(pc, next);
       }
 
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
+      if (pc->Is(CT_BRACE_OPEN))
       {
-         if (chunk_is_token(prev, CT_ELSE))
+         if (prev->Is(CT_ELSE))
          {
             vote_sp_else_brace.vote(prev, pc);
          }
-         else if (chunk_is_token(prev, CT_CATCH))
+         else if (prev->Is(CT_CATCH))
          {
             vote_sp_catch_brace.vote(prev, pc);
          }
-         else if (chunk_is_token(prev, CT_FINALLY))
+         else if (prev->Is(CT_FINALLY))
          {
             vote_sp_catch_brace.vote(prev, pc);
          }
-         else if (chunk_is_token(prev, CT_TRY))
+         else if (prev->Is(CT_TRY))
          {
             vote_sp_catch_brace.vote(prev, pc);
          }
-         else if (chunk_is_token(prev, CT_GETSET))
+         else if (prev->Is(CT_GETSET))
          {
             vote_sp_catch_brace.vote(prev, pc);
          }
 
-         if (chunk_is_token(next, CT_BRACE_CLOSE))
+         if (next->Is(CT_BRACE_CLOSE))
          {
             vote_sp_inside_braces_empty.vote(pc, next);
          }
@@ -410,19 +410,19 @@ static void detect_space_options(void)
          }
       }
 
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
+      if (pc->Is(CT_BRACE_CLOSE))
       {
          vote_sp_inside_braces.vote(prev, pc);
 
-         if (chunk_is_token(next, CT_ELSE))
+         if (next->Is(CT_ELSE))
          {
             vote_sp_brace_else.vote(pc, next);
          }
-         else if (chunk_is_token(next, CT_CATCH))
+         else if (next->Is(CT_CATCH))
          {
             vote_sp_brace_catch.vote(pc, next);
          }
-         else if (chunk_is_token(next, CT_FINALLY))
+         else if (next->Is(CT_FINALLY))
          {
             vote_sp_brace_finally.vote(pc, next);
          }
@@ -433,7 +433,7 @@ static void detect_space_options(void)
 } // detect_space_options
 
 
-void detect_options(void)
+void detect_options()
 {
    detect_space_options();
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.h
index 5c6ec1e2..77169322 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.h
@@ -10,7 +10,7 @@
 
 
 //! Call all the detect_xxxx() functions
-void detect_options(void);
+void detect_options();
 
 
 #endif /* DETECT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.cpp
index f91a1a2a..d44d5799 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.cpp
@@ -1,6 +1,6 @@
 /**
  * @file enum_cleanup.cpp
- * works on the last comma withing enum
+ * works on the last comma within enum
  *
  * @author  Guy Maurel Juli 2018
  * @license GPL v2+
@@ -15,7 +15,7 @@ constexpr static auto LCURRENT = LTOK;
 using namespace uncrustify;
 
 
-void enum_cleanup(void)
+void enum_cleanup()
 {
    LOG_FUNC_ENTRY();
 
@@ -30,28 +30,28 @@ void enum_cleanup(void)
 
    while (pc->IsNotNullChunk())
    {
-      if (  get_chunk_parent_type(pc) == CT_ENUM
-         && chunk_is_token(pc, CT_BRACE_CLOSE))
+      if (  pc->GetParentType() == CT_ENUM
+         && pc->Is(CT_BRACE_CLOSE))
       {
-         LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s\n",
-                 __func__, __LINE__, pc->orig_line, get_token_name(pc->type));
+         LOG_FMT(LTOK, "%s(%d): orig line is %zu, type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), get_token_name(pc->GetType()));
          Chunk *prev = pc->GetPrevNcNnl();                           // Issue #3604
 
          if (  prev != nullptr
             && prev->IsNotNullChunk())
          {
-            if (chunk_is_token(prev, CT_COMMA))
+            if (prev->Is(CT_COMMA))
             {
                log_rule_B("mod_enum_last_comma");
 
                if (options::mod_enum_last_comma() == IARF_REMOVE)
                {
-                  chunk_del(prev);
+                  Chunk::Delete(prev);
                }
             }
             else
             {
-               if (chunk_is_token(prev, CT_BRACE_OPEN))                // Issue #2902
+               if (prev->Is(CT_BRACE_OPEN))                // Issue #2902
                {
                   // nothing between CT_BRACE_OPEN and CT_BRACE_CLOSE
                }
@@ -64,26 +64,26 @@ void enum_cleanup(void)
                   {
                      // create a comma
                      Chunk comma;
-                     set_chunk_type(&comma, CT_COMMA);
-                     comma.orig_line = prev->orig_line;
-                     comma.orig_col  = prev->orig_col + 1;
-                     comma.nl_count  = 0;
-                     comma.pp_level  = 0;
-                     comma.flags     = PCF_NONE;
-                     comma.str       = ",";
+                     comma.SetType(CT_COMMA);
+                     comma.SetOrigLine(prev->GetOrigLine());
+                     comma.SetOrigCol(prev->GetOrigCol() + 1);
+                     comma.SetNlCount(0);
+                     comma.SetPpLevel(0);
+                     comma.SetFlags(PCF_NONE);
+                     comma.Str() = ",";
 
-                     if (chunk_is_token(prev, CT_PP_ENDIF))                // Issue #3604
+                     if (prev->Is(CT_PP_ENDIF))                // Issue #3604
                      {
                         prev = prev->GetPrevNcNnlNpp();
                      }
 
-                     if (chunk_is_token(prev, CT_COMMA))                   // Issue #3604
+                     if (prev->Is(CT_COMMA))                   // Issue #3604
                      {
                         // nothing to do
                      }
                      else
                      {
-                        chunk_add_after(&comma, prev);
+                        comma.CopyAndAddAfter(prev);
                      }
                      pc = pc->GetNext();
                   }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.h
index 3853c8ea..f9c46dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.h
@@ -9,8 +9,8 @@
 
 /**
  * Scans through the whole list and does stuff.
- * works on the last comma withing enum
+ * works on the last comma within enum
  */
-void enum_cleanup(void);
+void enum_cleanup();
 
 #endif /* ENUM_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_flags.h
index badd8226..4f4e33c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_flags.h
@@ -24,7 +24,7 @@
 
 #define UNC_DECLARE_OPERATORS_FOR_FLAGS(flag_type)                        \
    inline flag_type operator&(flag_type::enum_t f1, flag_type::enum_t f2) \
-   { return(flag_type{ f1 } & f2); }                                      \
+   { return(flag_type{ f1 } &f2); }                                       \
    inline flag_type operator|(flag_type::enum_t f1, flag_type::enum_t f2) \
    { return(flag_type{ f1 } | f2); }                                      \
    inline flag_type operator|(flag_type::enum_t f1, flag_type f2)         \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/error_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/error_types.h
index 4b162768..4b162768 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/error_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/src/flag_braced_init_list.cpp
new file mode 100644
index 00000000..66c128fa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_braced_init_list.cpp
@@ -0,0 +1,112 @@
+/**
+ * @file flag_braced_init_list.cpp
+ *
+ * @license GPL v2+
+ */
+
+#include "chunk.h"
+
+#include "flag_braced_init_list.h"
+
+#include "uncrustify.h"
+
+
+bool detect_cpp_braced_init_list(Chunk *pc, Chunk *next)
+{
+   LOG_FUNC_ENTRY();
+   // Issue #2332
+   bool we_have_a_case_before = false;
+
+   if (pc->Is(CT_COLON))
+   {
+      // check if we have a case before
+      Chunk *switch_before = pc->GetPrevType(CT_CASE, pc->GetLevel());
+
+      if (switch_before->IsNotNullChunk())
+      {
+         LOG_FMT(LFCNR, "%s(%d): switch_before orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
+                 __func__, __LINE__, switch_before->GetOrigLine(), switch_before->GetOrigCol(),
+                 switch_before->Text(), get_token_name(switch_before->GetType()));
+         we_have_a_case_before = true;
+      }
+   }
+
+   // Detect a braced-init-list
+   if (  pc->Is(CT_WORD)
+      || pc->Is(CT_TYPE)
+      || pc->Is(CT_ASSIGN)
+      || pc->Is(CT_RETURN)
+      || pc->Is(CT_COMMA)
+      || pc->Is(CT_ANGLE_CLOSE)
+      || pc->Is(CT_SQUARE_CLOSE)
+      || pc->Is(CT_TSQUARE)
+      || pc->Is(CT_FPAREN_OPEN)
+      || pc->Is(CT_QUESTION)
+      || (  pc->Is(CT_COLON)
+         && !we_have_a_case_before)
+      || (  pc->Is(CT_BRACE_OPEN)
+         && (  pc->GetParentType() == CT_NONE
+            || pc->GetParentType() == CT_BRACED_INIT_LIST)))
+   {
+      LOG_FMT(LFCNR, "%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()));
+      log_pcf_flags(LFCNR, pc->GetFlags());
+      auto brace_open = pc->GetNextNcNnl();
+
+      if (  brace_open->Is(CT_BRACE_OPEN)
+         && (  brace_open->GetParentType() == CT_NONE
+            || brace_open->GetParentType() == CT_ASSIGN
+            || brace_open->GetParentType() == CT_RETURN
+            || brace_open->GetParentType() == CT_BRACED_INIT_LIST))
+      {
+         log_pcf_flags(LFCNR, brace_open->GetFlags());
+         auto brace_close = next->GetClosingParen();
+
+         if (brace_close->Is(CT_BRACE_CLOSE))
+         {
+            return(true);
+         }
+      }
+   }
+   return(false);
+} // detect_cpp_braced_init_list
+
+
+void flag_cpp_braced_init_list(Chunk *pc, Chunk *next)
+{
+   Chunk *brace_open  = pc->GetNextNcNnl();
+   Chunk *brace_close = next->GetClosingParen();
+
+   brace_open->SetParentType(CT_BRACED_INIT_LIST);
+   brace_close->SetParentType(CT_BRACED_INIT_LIST);
+
+   Chunk *tmp = brace_close->GetNextNcNnl();
+
+   if (tmp->IsNotNullChunk())
+   {
+      tmp->ResetFlagBits(PCF_EXPR_START | PCF_STMT_START);
+
+      // Flag call operator
+      if (tmp->Is(CT_PAREN_OPEN))
+      {
+         Chunk *c = tmp->GetClosingParen();
+
+         if (c->IsNotNullChunk())
+         {
+            tmp->SetType(CT_FPAREN_OPEN);
+            tmp->SetParentType(CT_FUNC_CALL);
+            c->SetType(CT_FPAREN_CLOSE);
+            c->SetParentType(CT_FUNC_CALL);
+         }
+      }
+   }
+   // TODO: Change pc->GetType() CT_WORD -> CT_TYPE
+   // for the case CT_ASSIGN (and others).
+
+   // TODO: Move this block to the fix_fcn_call_args function.
+   if (  pc->Is(CT_WORD)
+      && pc->TestFlags(PCF_IN_FCN_CALL))
+   {
+      pc->SetType(CT_TYPE);
+   }
+} // flag_cpp_braced_init_list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_braced_init_list.h
index 8d89dd08..75d19a79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_braced_init_list.h
@@ -7,6 +7,8 @@
 #ifndef FLAG_BRACED_INIT_LIST_INCLUDED
 #define FLAG_BRACED_INIT_LIST_INCLUDED
 
+#include "chunk.h"
+
 
 /**
  * Detect a cpp braced init list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.cpp
index a3036f81..6950bc10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.cpp
@@ -11,13 +11,13 @@ bool flag_cpp_decltype(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(pc, CT_DECLTYPE))
+   if (pc->Is(CT_DECLTYPE))
    {
       auto paren_open = pc->GetNextNcNnl();
 
-      if (chunk_is_token(paren_open, CT_PAREN_OPEN))
+      if (paren_open->Is(CT_PAREN_OPEN))
       {
-         // We would like to simply call chunk_skip_to_match(), but it finds
+         // We would like to simply call Chunk::SkipToMatch(), but it finds
          // a match based on level, and the level is 0 for all chunks in some
          // cases, like the following example.
          //
@@ -29,14 +29,14 @@ bool flag_cpp_decltype(Chunk *pc)
          // closing parenthesis right before ".put" in the above example.
          //
          // So, we will manually look for the matching closing parenthesis.
-         chunk_flags_set(paren_open, PCF_IN_DECLTYPE);
+         paren_open->SetFlagBits(PCF_IN_DECLTYPE);
          pc = paren_open->GetNextNcNnl();
 
          for (int level = 1; pc->IsNotNullChunk() && level > 0; pc = pc->GetNextNcNnl())
          {
-            level += chunk_is_token(pc, CT_PAREN_OPEN);
-            level -= chunk_is_token(pc, CT_PAREN_CLOSE);
-            chunk_flags_set(pc, PCF_IN_DECLTYPE);
+            level += pc->Is(CT_PAREN_OPEN);
+            level -= pc->Is(CT_PAREN_CLOSE);
+            pc->SetFlagBits(PCF_IN_DECLTYPE);
          }
 
          return(pc->IsNotNullChunk());
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.h
index 80677c8e..293fcd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.h
@@ -7,6 +7,7 @@
 #ifndef FLAG_DECLTYPE_INCLUDED
 #define FLAG_DECLTYPE_INCLUDED
 
+#include "chunk.h"
 
 /**
  * Flags all chunks within a cpp decltype expression from the opening
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.cpp
new file mode 100644
index 00000000..c435710a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.cpp
@@ -0,0 +1,71 @@
+/**
+ * @file flag_parens.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "flag_parens.h"
+
+#include "uncrustify.h"
+
+
+Chunk *flag_parens(Chunk *po, T_PcfFlags flags, E_Token opentype, E_Token parent_type, bool parent_all)
+{
+   LOG_FUNC_ENTRY();
+   Chunk *paren_close;
+
+   paren_close = po->GetClosingParen(E_Scope::PREPROC);
+
+   if (paren_close->IsNullChunk())
+   {
+      LOG_FMT(LERR, "%s(%d): no match for '%s' at [%zu:%zu]",
+              __func__, __LINE__, po->Text(), po->GetOrigLine(), po->GetOrigCol());
+      log_func_stack_inline(LERR);
+      exit(EX_SOFTWARE);
+   }
+   LOG_FMT(LFLPAREN, "%s(%d): between  po is '%s', orig line is %zu, orig col is %zu, and\n",
+           __func__, __LINE__, po->Text(), po->GetOrigLine(), po->GetOrigCol());
+   LOG_FMT(LFLPAREN, "%s(%d): paren_close is '%s', orig line is %zu, orig col is %zu, type is %s, parent type is %s\n",
+           __func__, __LINE__, paren_close->Text(), paren_close->GetOrigLine(), paren_close->GetOrigCol(),
+           get_token_name(opentype), get_token_name(parent_type));
+   log_func_stack_inline(LFLPAREN);
+
+   // the last chunk must be also modified. Issue #2149
+   Chunk *after_paren_close = paren_close->GetNext();
+
+   if (po != paren_close)
+   {
+      if (  flags != PCF_NONE
+         || (  parent_all
+            && parent_type != CT_NONE))
+      {
+         Chunk *pc;
+
+         for (pc = po->GetNext(E_Scope::PREPROC);
+              pc != nullptr && pc->IsNotNullChunk() && pc != after_paren_close;
+              pc = pc->GetNext(E_Scope::PREPROC))
+         {
+            pc->SetFlagBits(flags);
+
+            if (parent_all)
+            {
+               pc->SetParentType(parent_type);
+            }
+         }
+      }
+
+      if (opentype != CT_NONE)
+      {
+         po->SetType(opentype);
+         paren_close->SetType((E_Token)(opentype + 1));
+      }
+
+      if (parent_type != CT_NONE)
+      {
+         po->SetParentType(parent_type);
+         paren_close->SetParentType(parent_type);
+      }
+   }
+   return(paren_close->GetNextNcNnl(E_Scope::PREPROC));
+} // flag_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.h
index a093886c..220eb127 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.h
@@ -22,7 +22,7 @@
  *
  * @return The token after the close paren
  */
-Chunk *flag_parens(Chunk *po, pcf_flags_t flags, E_Token opentype, E_Token parenttype, bool parent_all);
+Chunk *flag_parens(Chunk *po, T_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.75.0/src/frame_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.cpp
index 36c11020..da94ba2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/frame_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.cpp
@@ -69,10 +69,10 @@ void fl_log_frms(log_sev_t                     logsev,
 {
    LOG_FMT(logsev, "%s Parse Frames(%zu):", txt, frames.size());
 
-   for (size_t idx = 0; idx < frames.size(); idx++)
+   for (const auto &frame : frames)
    {
-      LOG_FMT(logsev, " [%s-%zu]", get_token_name(frames.at(idx).in_ifdef),
-              frames.at(idx).ref_no);
+      LOG_FMT(logsev, " [%s-%zu]", get_token_name(frame.in_ifdef),
+              frame.ref_no);
    }
 
    LOG_FMT(logsev, "-[%s-%zu]\n", get_token_name(frm.in_ifdef), frm.ref_no);
@@ -150,7 +150,7 @@ void fl_pop(std::vector<ParseFrame> &frames, ParseFrame &pf)
 
 int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Chunk *pc)
 {
-   if (pc->type != CT_PREPROC)
+   if (pc->IsNot(CT_PREPROC))
    {
       return(pp_level);
    }
@@ -161,15 +161,15 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
       return(pp_level);
    }
 
-   if (get_chunk_parent_type(pc) != next->type)
+   if (pc->GetParentType() != next->GetType())
    {
-      LOG_FMT(LNOTE, "%s(%d): Preproc parent not set correctly on orig_line %zu: got %s expected %s\n",
-              __func__, __LINE__, pc->orig_line, get_token_name(get_chunk_parent_type(pc)),
-              get_token_name(next->type));
-      set_chunk_parent(pc, next->type);
+      LOG_FMT(LNOTE, "%s(%d): Preproc parent not set correctly on orig line %zu: got %s expected %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), get_token_name(pc->GetParentType()),
+              get_token_name(next->GetType()));
+      pc->SetParentType(next->GetType());
    }
-   LOG_FMT(LPFCHK, "%s(%d): orig_line is %zu, %s\n",
-           __func__, __LINE__, pc->orig_line, get_token_name(get_chunk_parent_type(pc)));
+   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);
 
 
@@ -179,12 +179,12 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
 
    const char    *txt = nullptr;
 
-   if (pc->flags.test(PCF_IN_PREPROC))
+   if (pc->TestFlags(PCF_IN_PREPROC))
    {
       LOG_FMT(LPF, " <In> ");
       fl_log(LPF, frm);
 
-      if (get_chunk_parent_type(pc) == CT_PP_IF)
+      if (pc->GetParentType() == CT_PP_IF)
       {
          // An #if pushes a copy of the current frame on the stack
          pp_level++;
@@ -192,12 +192,12 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
          frm.in_ifdef = CT_PP_IF;
          txt          = "if-push";
       }
-      else if (get_chunk_parent_type(pc) == CT_PP_ELSE)
+      else if (pc->GetParentType() == CT_PP_ELSE)
       {
          if (out_pp_level == 0)
          {
-            fprintf(stderr, "%s(%d): pp_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
+            fprintf(stderr, "%s(%d): pp level is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
             log_flush(true);
             exit(EX_SOFTWARE);
          }
@@ -232,8 +232,8 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
             if (  options::pp_warn_unbalanced_if()
                && brace_level != base_brace_level)
             {
-               LOG_FMT(LWARN, "%s(%d): orig_line is %zu, unbalanced #if block braces (1), in-level is %zu, out-level is %zu\n",
-                       __func__, __LINE__, pc->orig_line, base_brace_level, brace_level);
+               LOG_FMT(LWARN, "%s(%d): orig line is %zu, unbalanced #if block braces (1), in-level is %zu, out-level is %zu\n",
+                       __func__, __LINE__, pc->GetOrigLine(), base_brace_level, brace_level);
             }
          }
          else
@@ -244,13 +244,13 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
             if (  options::pp_warn_unbalanced_if()
                && brace_level != if_brace_level)
             {
-               LOG_FMT(LWARN, "%s(%d): orig_line is %zu, unbalanced #if-#else block braces (1), #else out-level is %zu, #if out-level is %zu\n",
-                       __func__, __LINE__, pc->orig_line, brace_level, if_brace_level);
+               LOG_FMT(LWARN, "%s(%d): orig line is %zu, unbalanced #if-#else block braces (1), #else out-level is %zu, #if out-level is %zu\n",
+                       __func__, __LINE__, pc->GetOrigLine(), brace_level, if_brace_level);
             }
          }
          txt = "else-push";
       }
-      else if (get_chunk_parent_type(pc) == CT_PP_ENDIF)
+      else if (pc->GetParentType() == CT_PP_ENDIF)
       {
          /*
           * we may have [...] [base] [if]-[else] or [...] [base]-[if].
@@ -260,7 +260,7 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
          {
             // cpd.pp_level is ZERO, cannot be decremented.
             fprintf(stderr, "%s(%d): #endif found, at line %zu, column %zu, without corresponding #if\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
             log_flush(true);
             exit(EX_SOFTWARE);
          }
@@ -268,8 +268,8 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
 
          if (out_pp_level == 0)
          {
-            fprintf(stderr, "%s(%d): pp_level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col);
+            fprintf(stderr, "%s(%d): pp level is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
             log_flush(true);
             exit(EX_SOFTWARE);
          }
@@ -287,8 +287,8 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
             if (  options::pp_warn_unbalanced_if()
                && brace_level != frm.brace_level)
             {
-               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->orig_line, brace_level, frm.brace_level);
+               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);
             }
 
             if (frames.size() < 2)
@@ -317,8 +317,8 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
             if (  options::pp_warn_unbalanced_if()
                && brace_level != frm.brace_level)
             {
-               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->orig_line, frm.brace_level, brace_level);
+               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);
             }
             txt = "endif-pop";
          }
@@ -331,9 +331,9 @@ 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",
-              __func__, __LINE__, pc->orig_line,
-              get_token_name(get_chunk_parent_type(pc)), txt, get_token_name(in_ifdef),
+      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",
+              __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);
       LOG_FMT(LPF, " <Out>");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/frame_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.h
index 5fd09a52..5fd09a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/frame_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.cpp
index e23dc25c..b9f515ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.cpp
@@ -11,6 +11,7 @@
 
 #include "align.h"
 #include "frame_list.h"
+#include "options.h"
 #include "options_for_QT.h"
 #include "prototypes.h"
 #include "quick_align_again.h"
@@ -63,9 +64,9 @@ using namespace uncrustify;
  * cont-col is set to the column of the item after the open paren, unless
  * followed by a newline, then it is set to (brace-col + indent_columns).
  * Examples:
- *    a_really_long_funcion_name(
+ *    a_really_long_function_name(
  *       param1, param2);
- *    a_really_long_funcion_name(param1,
+ *    a_really_long_function_name(param1,
  *                               param2);
  *
  * Assignments:
@@ -199,9 +200,9 @@ void indent_to_column(Chunk *pc, size_t column)
 {
    LOG_FUNC_ENTRY();
 
-   if (column < pc->column)
+   if (column < pc->GetColumn())
    {
-      column = pc->column;
+      column = pc->GetColumn();
    }
    reindent_line(pc, column);
 }
@@ -228,18 +229,18 @@ void align_to_column(Chunk *pc, size_t column)
    LOG_FUNC_ENTRY();
 
    if (  pc == nullptr
-      || column == pc->column)
+      || column == pc->GetColumn())
    {
       return;
    }
-   LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s => column is %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->column, pc->Text(),
-           get_token_name(pc->type), column);
+   LOG_FMT(LINDLINE, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s => column is %zu\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetColumn(), pc->Text(),
+           get_token_name(pc->GetType()), column);
 
-   const auto col_delta = static_cast<int>(column) - static_cast<int>(pc->column);
-   size_t     min_col   = column;
+   const int col_delta = column - pc->GetColumn();
+   size_t    min_col   = column;
 
-   pc->column = column;
+   pc->SetColumn(column);
 
    do
    {
@@ -258,10 +259,10 @@ void align_to_column(Chunk *pc, size_t column)
       auto almod = align_mode_e::SHIFT;
 
       if (  pc->IsComment()
-         && get_chunk_parent_type(pc) != CT_COMMENT_EMBED)
+         && pc->GetParentType() != CT_COMMENT_EMBED)
       {
          log_rule_B("indent_relative_single_line_comments");
-         almod = (  chunk_is_single_line_comment(pc)
+         almod = (  pc->IsSingleLineComment()
                  && options::indent_relative_single_line_comments())
                  ? align_mode_e::KEEP_REL : align_mode_e::KEEP_ABS;
       }
@@ -269,31 +270,31 @@ void align_to_column(Chunk *pc, size_t column)
       if (almod == align_mode_e::KEEP_ABS)
       {
          // Keep same absolute column
-         pc->column = max(pc->orig_col, min_col);
+         pc->SetColumn(max(pc->GetOrigCol(), min_col));
       }
       else if (almod == align_mode_e::KEEP_REL)
       {
          // Keep same relative column
-         auto orig_delta = static_cast<int>(pc->orig_col) - static_cast<int>(prev->orig_col);
-         orig_delta = max<int>(orig_delta, min_delta);  // keeps orig_delta positive
+         size_t orig_delta = pc->GetOrigPrevSp() + prev->Len();
+         orig_delta = max<size_t>(orig_delta, min_delta);  // keeps orig_delta positive
 
-         pc->column = prev->column + static_cast<size_t>(orig_delta);
+         pc->SetColumn(prev->GetColumn() + orig_delta);
       }
       else // SHIFT
       {
          // Shift by the same amount, keep above negative values
-         pc->column = (  col_delta >= 0
-                      || cast_abs(pc->column, col_delta) < pc->column)
-                      ? pc->column + col_delta : 0;
-         pc->column = max(pc->column, min_col);
+         pc->SetColumn((  col_delta >= 0
+                       || (size_t)(abs(col_delta)) < pc->GetColumn())
+                      ? pc->GetColumn() + col_delta : 0);
+         pc->SetColumn(max(pc->GetColumn(), min_col));
       }
-      LOG_FMT(LINDLINED, "%s(%d):   %s set column of '%s', type is %s, orig_line is %zu, to col %zu (orig_col was %zu)\n",
+      LOG_FMT(LINDLINED, "%s(%d):   %s set column of '%s', type is %s, orig line is %zu, to col %zu (orig col was %zu)\n",
               __func__, __LINE__,
               (almod == align_mode_e::KEEP_ABS) ? "abs" :
               (almod == align_mode_e::KEEP_REL) ? "rel" : "sft",
-              pc->Text(), get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col);
+              pc->Text(), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetColumn(), pc->GetOrigCol());
    } while (  pc->IsNotNullChunk()
-           && pc->nl_count == 0);
+           && pc->GetNlCount() == 0);
 } // align_to_column
 
 
@@ -302,20 +303,20 @@ void reindent_line(Chunk *pc, size_t column)
    LOG_FUNC_ENTRY();
    char copy[1000];
 
-   LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, on '%s' [%s/%s] => %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy),
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
+   LOG_FMT(LINDLINE, "%s(%d): orig line is %zu, orig col is %zu, on '%s' [%s/%s] => %zu\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy),
+           get_token_name(pc->GetType()), get_token_name(pc->GetParentType()),
            column);
    log_func_stack_inline(LINDLINE);
 
-   if (column == pc->column)
+   if (column == pc->GetColumn())
    {
       return;
    }
-   auto col_delta = static_cast<int>(column) - static_cast<int>(pc->column);
-   auto min_col   = column;
+   int    col_delta = column - pc->GetColumn();
+   size_t min_col   = column;
 
-   pc->column = column;
+   pc->SetColumn(column);
 
    do
    {
@@ -324,7 +325,7 @@ void reindent_line(Chunk *pc, size_t column)
          // fix the bug #654
          // connect(&mapper, SIGNAL(mapped(QString &)), this, SLOT(onSomeEvent(QString &)));
          // look for end of SIGNAL/SLOT block
-         if (!pc->flags.test(PCF_IN_QT_MACRO))
+         if (!pc->TestFlags(PCF_IN_QT_MACRO))
          {
             LOG_FMT(LINDLINE, "FLAGS is NOT set: PCF_IN_QT_MACRO\n");
             restore_options_for_QT();
@@ -333,10 +334,10 @@ void reindent_line(Chunk *pc, size_t column)
       else
       {
          // look for begin of SIGNAL/SLOT block
-         if (pc->flags.test(PCF_IN_QT_MACRO))
+         if (pc->TestFlags(PCF_IN_QT_MACRO))
          {
             LOG_FMT(LINDLINE, "FLAGS is set: PCF_IN_QT_MACRO\n");
-            save_set_options_for_QT(pc->level);
+            save_set_options_for_QT(pc->GetLevel());
          }
       }
       Chunk *next = pc->GetNext();
@@ -346,7 +347,7 @@ void reindent_line(Chunk *pc, size_t column)
          break;
       }
 
-      if (pc->nl_count)
+      if (pc->GetNlCount())
       {
          min_col   = 0;
          col_delta = 0;
@@ -357,25 +358,24 @@ void reindent_line(Chunk *pc, size_t column)
       const bool is_comment = pc->IsComment();
       log_rule_B("indent_relative_single_line_comments");
       const bool keep = (  is_comment
-                        && chunk_is_single_line_comment(pc)
+                        && pc->IsSingleLineComment()
                         && options::indent_relative_single_line_comments());
 
       if (  is_comment
-         && get_chunk_parent_type(pc) != CT_COMMENT_EMBED
+         && pc->GetParentType() != CT_COMMENT_EMBED
          && !keep)
       {
-         pc->column = max(pc->orig_col, min_col);
+         pc->SetColumn(max(pc->GetOrigCol(), min_col));
          LOG_FMT(LINDLINE, "%s(%d): set comment on line %zu to col %zu (orig %zu)\n",
-                 __func__, __LINE__, pc->orig_line, pc->column, pc->orig_col);
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetColumn(), pc->GetOrigCol());
       }
       else
       {
-         const auto tmp_col = static_cast<int>(pc->column) + col_delta;
-         pc->column = max(tmp_col, static_cast<int>(min_col));
+         pc->SetColumn(max(pc->GetColumn() + col_delta, min_col));
 
          LOG_FMT(LINDLINED, "%s(%d): set column of ", __func__, __LINE__);
 
-         if (chunk_is_token(pc, CT_NEWLINE))
+         if (pc->Is(CT_NEWLINE))
          {
             LOG_FMT(LINDLINED, "<Newline>");
          }
@@ -383,10 +383,10 @@ void reindent_line(Chunk *pc, size_t column)
          {
             LOG_FMT(LINDLINED, "'%s'", pc->Text());
          }
-         LOG_FMT(LINDLINED, " to %zu (orig %zu)\n", pc->column, pc->orig_col);
+         LOG_FMT(LINDLINED, " to %zu (orig %zu)\n", pc->GetColumn(), pc->GetOrigCol());
       }
    } while (  pc->IsNotNullChunk()
-           && pc->nl_count == 0);
+           && pc->GetNlCount() == 0);
 } // reindent_line
 
 
@@ -423,8 +423,8 @@ static size_t token_indent(E_Token type)
 
 #define indent_column_set(X)                                                                 \
    do {                                                                                      \
-      LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, indent_column changed from %zu to %zu\n", \
-              __func__, __LINE__, pc->orig_line, indent_column, (size_t)X);                  \
+      LOG_FMT(LINDENT2, "%s(%d): orig line is %zu, indent_column changed from %zu to %zu\n", \
+              __func__, __LINE__, pc->GetOrigLine(), indent_column, (size_t)X);              \
       indent_column = (X);                                                                   \
    } while (false)
 
@@ -432,7 +432,7 @@ static size_t token_indent(E_Token type)
 static size_t get_indent_first_continue(Chunk *pc)
 {
    log_rule_B("indent_ignore_first_continue");
-   Chunk *continuation = pc->GetNextType(CT_NEWLINE, pc->level);
+   Chunk *continuation = pc->GetNextType(CT_NEWLINE, pc->GetLevel());
 
    if (continuation->IsNotNullChunk())
    {
@@ -440,7 +440,7 @@ static size_t get_indent_first_continue(Chunk *pc)
 
       if (continuation->IsNotNullChunk())
       {
-         return(continuation->orig_col);
+         return(continuation->GetOrigCol());
       }
    }
    return(0);
@@ -469,13 +469,13 @@ static size_t calc_indent_continue(const ParseFrame &frm)
 
 static Chunk *candidate_chunk_first_on_line(Chunk *pc)
 {
-   Chunk *first = chunk_first_on_line(pc);
+   Chunk *first = pc->GetFirstChunkOnLine();
 
    log_rule_B("indent_inside_ternary_operator");
 
    if (  options::indent_inside_ternary_operator()
-      && (  chunk_is_token(first, CT_QUESTION)
-         || chunk_is_token(first, CT_COND_COLON)))
+      && (  first->Is(CT_QUESTION)
+         || first->Is(CT_COND_COLON)))
    {
       return(first->GetNextNcNnl());
    }
@@ -504,19 +504,19 @@ static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace,
    }
 
    // Skip to open paren in ':^TYPE *(ARGS) {'
-   if (chunk_is_paren_close(tmp))
+   if (tmp->IsParenClose())
    {
-      tmp = chunk_skip_to_match_rev(tmp)->GetPrevNc();
+      tmp = tmp->GetOpeningParen()->GetPrevNc();
    }
 
    // // Check for star in ':^TYPE *(ARGS) {'. Issue 2477
-   if (chunk_is_token(tmp, CT_PTR_TYPE))
+   if (tmp->Is(CT_PTR_TYPE))
    {
       tmp = tmp->GetPrevNc();
    }
 
    // Check for type in ':^TYPE *(ARGS) {'. Issue 2482
-   if (chunk_is_token(tmp, CT_TYPE))
+   if (tmp->Is(CT_TYPE))
    {
       tmp = tmp->GetPrevNc();
    }
@@ -525,19 +525,19 @@ static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace,
    Chunk *caret_tmp = Chunk::NullChunkPtr;
 
    if (  tmp->IsNotNullChunk()
-      && tmp->type == CT_OC_BLOCK_CARET)
+      && tmp->GetType() == CT_OC_BLOCK_CARET)
    {
       caret_tmp = tmp;
    }
    else
    {
-      caret_tmp = tmp->GetPrevType(CT_OC_BLOCK_CARET, -1);
+      caret_tmp = tmp->GetPrevType(CT_OC_BLOCK_CARET);
       tmp       = caret_tmp;
    }
 
    // If we still cannot find caret then return first chunk on the line
    if (  tmp->IsNullChunk()
-      || tmp->type != CT_OC_BLOCK_CARET)
+      || tmp->IsNot(CT_OC_BLOCK_CARET))
    {
       return(candidate_chunk_first_on_line(pc));
    }
@@ -552,7 +552,7 @@ static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace,
    if (from_colon)
    {
       if (  tmp->IsNullChunk()
-         || tmp->type != CT_OC_COLON)
+         || tmp->IsNot(CT_OC_COLON))
       {
          return(candidate_chunk_first_on_line(pc));
       }
@@ -566,8 +566,8 @@ static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace,
    if (from_keyword)
    {
       if (  tmp->IsNullChunk()
-         || (  tmp->type != CT_OC_MSG_NAME
-            && tmp->type != CT_OC_MSG_FUNC))
+         || (  tmp->IsNot(CT_OC_MSG_NAME)
+            && tmp->IsNot(CT_OC_MSG_FUNC)))
       {
          return(candidate_chunk_first_on_line(pc));
       }
@@ -618,34 +618,34 @@ static void _log_indent_tmp(const char *func, const uint32_t line, const ParseFr
 }
 
 
-static void quick_indent_again(void)
+static void quick_indent_again()
 {
    LOG_FUNC_ENTRY();
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (pc->indent.ref == nullptr)
+      if (pc->GetIndentData().ref == nullptr)
       {
          continue;
       }
       Chunk *tmp = pc->GetPrev();
 
-      if (!chunk_is_newline(tmp))
+      if (!tmp->IsNewline())
       {
          continue;
       }
-      const size_t col = pc->indent.ref->column + pc->indent.delta;
+      const size_t col = pc->GetIndentData().ref->GetColumn() + pc->GetIndentData().delta;
       indent_to_column(pc, col);
 
       LOG_FMT(LINDENTAG, "%s(%d): [%zu] indent [%s] to %zu based on [%s] @ %zu:%zu\n",
-              __func__, __LINE__, pc->orig_line, pc->Text(), col,
-              pc->indent.ref->Text(), pc->indent.ref->orig_line,
-              pc->indent.ref->column);
+              __func__, __LINE__, pc->GetOrigLine(), pc->Text(), col,
+              pc->GetIndentData().ref->Text(), pc->GetIndentData().ref->GetOrigLine(),
+              pc->GetIndentData().ref->GetColumn());
    }
 }
 
 
-void indent_text(void)
+void indent_text()
 {
    LOG_FUNC_ENTRY();
    bool   did_newline = true;
@@ -670,19 +670,18 @@ void indent_text(void)
    while (  pc != nullptr
          && pc->IsNotNullChunk())
    {
-      LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, for '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+      LOG_CHUNK(LINDLINE, pc);
       //  forces string literal to column-1 [Fix for 1246]
       log_rule_B("indent_col1_multi_string_literal");
 
-      if (  (pc->type == CT_STRING_MULTI)
+      if (  (pc->GetType() == CT_STRING_MULTI)
          && !(cpd.lang_flags & LANG_OC)                      // Issue #1795
          && options::indent_col1_multi_string_literal())
       {
          string str = pc->Text();
 
          if (  (str[0] == '@')
-            && (pc->GetPrev()->type == CT_NEWLINE))
+            && (pc->GetPrev()->GetType() == CT_NEWLINE))
          {
             indent_column_set(1);
             reindent_line(pc, indent_column);
@@ -691,22 +690,22 @@ void indent_text(void)
          }
       }
 
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
-         LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, <Newline>\n",
-                 __func__, __LINE__, pc->orig_line);
+         LOG_FMT(LINDLINE, "%s(%d): orig line is %zu, <Newline>\n",
+                 __func__, __LINE__, pc->GetOrigLine());
       }
-      else if (chunk_is_token(pc, CT_NL_CONT))
+      else if (pc->Is(CT_NL_CONT))
       {
-         LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, CT_NL_CONT\n",
-                 __func__, __LINE__, pc->orig_line);
+         LOG_FMT(LINDLINE, "%s(%d): orig line is %zu, CT_NL_CONT\n",
+                 __func__, __LINE__, pc->GetOrigLine());
       }
       else
       {
          char copy[1000];
-         LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, for '%s'\n   ",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->ElidedText(copy));
-         log_pcf_flags(LINDLINE, pc->flags);
+         LOG_FMT(LINDLINE, "%s(%d): orig line is %zu, orig col is %zu, column is %zu, for '%s'\n   ",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetColumn(), pc->ElidedText(copy));
+         log_pcf_flags(LINDLINE, pc->GetFlags());
       }
       log_rule_B("use_options_overriding_for_qt_macros");
 
@@ -714,13 +713,13 @@ void indent_text(void)
          && (  strcmp(pc->Text(), "SIGNAL") == 0
             || strcmp(pc->Text(), "SLOT") == 0))
       {
-         LOG_FMT(LINDLINE, "%s(%d): orig_line=%zu: type %s SIGNAL/SLOT found\n",
-                 __func__, __LINE__, pc->orig_line, get_token_name(pc->type));
+         LOG_FMT(LINDLINE, "%s(%d): orig line=%zu: type %s SIGNAL/SLOT found\n",
+                 __func__, __LINE__, pc->GetOrigLine(), get_token_name(pc->GetType()));
       }
       // Handle preprocessor transitions
       log_rule_B("indent_brace_parent");
       const size_t parent_token_indent = (options::indent_brace_parent())
-                                         ? token_indent(get_chunk_parent_type(pc)) : 0;
+                                         ? token_indent(pc->GetParentType()) : 0;
 
       // Handle "force indentation of function definition to start in column 1"
       log_rule_B("indent_func_def_force_col1");
@@ -731,10 +730,10 @@ void indent_text(void)
          {
             Chunk *next = pc->GetNextNcNnl();
 
-            if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-               || (  chunk_is_token(pc, CT_COMMENT)
+            if (  pc->GetParentType() == CT_FUNC_DEF
+               || (  pc->Is(CT_COMMENT)
                   && next->IsNotNullChunk()
-                  && get_chunk_parent_type(next) == CT_FUNC_DEF))
+                  && next->GetParentType() == CT_FUNC_DEF))
             {
                in_func_def = true;
                frm.push(pc, __func__, __LINE__);
@@ -747,18 +746,18 @@ void indent_text(void)
          {
             Chunk *prev = pc->GetPrev();
 
-            if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-               && get_chunk_parent_type(prev) == CT_FUNC_DEF)
+            if (  prev->Is(CT_BRACE_CLOSE)
+               && prev->GetParentType() == CT_FUNC_DEF)
             {
                in_func_def = false;
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
          }
       }
       // Clean up after a #define, etc
-      const bool in_preproc = pc->flags.test(PCF_IN_PREPROC);
+      const bool in_preproc = pc->TestFlags(PCF_IN_PREPROC);
 
       if (!in_preproc)
       {
@@ -766,8 +765,8 @@ void indent_text(void)
                && frm.top().in_preproc)
          {
             const E_Token type = frm.top().type;
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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);
 
             /*
@@ -777,21 +776,21 @@ void indent_text(void)
             if (  type == CT_PP_ENDREGION
                && frm.top().type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
          }
       }
-      else if (chunk_is_token(pc, CT_PREPROC)) // #
+      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
-            && (  get_chunk_parent_type(pc) == CT_PP_ENDIF
-               || get_chunk_parent_type(pc) == CT_PP_ELSE))
+            && (  pc->GetParentType() == CT_PP_ENDIF
+               || pc->GetParentType() == CT_PP_ELSE))
          {
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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);
          }
          ParseFrame frmbkup = frm;
@@ -801,7 +800,7 @@ void indent_text(void)
          log_rule_B("pp_region_indent_code");
 
          if (  options::pp_region_indent_code()
-            && get_chunk_parent_type(pc) == CT_PP_REGION)
+            && pc->GetParentType() == CT_PP_REGION)
          {
             Chunk *next = pc->GetNext();
 
@@ -810,9 +809,9 @@ void indent_text(void)
                break;
             }
             // Hack to get the logs to look right
-            set_chunk_type(next, CT_PP_REGION_INDENT);
+            next->SetType(CT_PP_REGION_INDENT);
             frm.push(next, __func__, __LINE__);
-            set_chunk_type(next, CT_PP_REGION);
+            next->SetType(CT_PP_REGION);
 
             // Indent one level
             frm.top().indent = frm.prev().indent + indent_size;
@@ -843,8 +842,8 @@ void indent_text(void)
          log_rule_B("pp_if_indent_code");
 
          if (  options::pp_if_indent_code()
-            && (  get_chunk_parent_type(pc) == CT_PP_IF
-               || get_chunk_parent_type(pc) == CT_PP_ELSE))
+            && (  pc->GetParentType() == CT_PP_IF
+               || pc->GetParentType() == CT_PP_ELSE))
          {
             Chunk *next = pc->GetNext();
 
@@ -864,10 +863,10 @@ void indent_text(void)
             log_rule_B("pp_indent_extern");
 
             while (  preproc_next->IsNotNullChunk()
-                  && preproc_next->type != CT_NEWLINE)
+                  && preproc_next->IsNot(CT_NEWLINE))
             {
-               if (  (chunk_is_token(preproc_next, CT_BRACE_OPEN))
-                  || (chunk_is_token(preproc_next, CT_BRACE_CLOSE)))
+               if (  (preproc_next->Is(CT_BRACE_OPEN))
+                  || (preproc_next->Is(CT_BRACE_CLOSE)))
                {
                   if (options::pp_indent_brace() == 0)
                   {
@@ -880,11 +879,11 @@ void indent_text(void)
                      break;
                   }
                }
-               else if (  (  chunk_is_token(preproc_next, CT_FUNC_DEF)
+               else if (  (  preproc_next->Is(CT_FUNC_DEF)
                           && !options::pp_indent_func_def())
-                       || (  chunk_is_token(preproc_next, CT_CASE)
+                       || (  preproc_next->Is(CT_CASE)
                           && !options::pp_indent_case())
-                       || (  chunk_is_token(preproc_next, CT_EXTERN)
+                       || (  preproc_next->Is(CT_EXTERN)
                           && !options::pp_indent_extern()))
                {
                   should_indent_preproc = false;
@@ -897,21 +896,21 @@ void indent_text(void)
             {
                // Hack to get the logs to look right
 
-               const E_Token memtype = next->type;
-               set_chunk_type(next, CT_PP_IF_INDENT);
+               const E_Token memtype = next->GetType();
+               next->SetType(CT_PP_IF_INDENT);
                frm.push(next, __func__, __LINE__);
-               set_chunk_type(next, memtype);
+               next->SetType(memtype);
 
                if (should_ignore_preproc)
                {
                   // Preserve original indentation
-                  frm.top().indent = pc->GetNextNl()->GetNext()->orig_col;
+                  frm.top().indent = pc->GetNextNl()->GetNext()->GetOrigCol();
                   log_indent();
                }
                else
                {
                   // Indent one level except if the #if is a #include guard
-                  size_t extra = (  pc->pp_level == 0
+                  size_t extra = (  pc->GetPpLevel() == 0
                                  && ifdef_over_whole_file())
                                  ? 0 : indent_size;
 
@@ -929,29 +928,29 @@ void indent_text(void)
 
          if (options::indent_member_single())
          {
-            if (get_chunk_parent_type(pc) == CT_PP_IF)
+            if (pc->GetParentType() == CT_PP_IF)
             {
                // do nothing
             }
-            else if (get_chunk_parent_type(pc) == CT_PP_ELSE)
+            else if (pc->GetParentType() == CT_PP_ELSE)
             {
                if (  frm.top().type == CT_MEMBER
-                  && frm.top().pop_pc != nullptr
+                  && frm.top().pop_pc->IsNotNullChunk()
                   && frm.top().pc != frmbkup.top().pc)
                {
                   Chunk *tmp = pc->GetNextNcNnlNpp();
 
                   if (tmp->IsNotNullChunk())
                   {
-                     if (  chunk_is_token(tmp, CT_WORD)
-                        || chunk_is_token(tmp, CT_TYPE))
+                     if (  tmp->Is(CT_WORD)
+                        || tmp->Is(CT_TYPE))
                      {
                         tmp = pc->GetNextNcNnlNpp();
                      }
-                     else if (  chunk_is_token(tmp, CT_FUNC_CALL)
-                             || chunk_is_token(tmp, CT_FPAREN_OPEN))
+                     else if (  tmp->Is(CT_FUNC_CALL)
+                             || tmp->Is(CT_FPAREN_OPEN))
                      {
-                        tmp = tmp->GetNextType(CT_FPAREN_CLOSE, tmp->level);
+                        tmp = tmp->GetNextType(CT_FPAREN_CLOSE, tmp->GetLevel());
 
                         if (tmp->IsNotNullChunk())
                         {
@@ -966,7 +965,7 @@ void indent_text(void)
                   }
                }
             }
-            else if (get_chunk_parent_type(pc) == CT_PP_ENDIF)
+            else if (pc->GetParentType() == CT_PP_ENDIF)
             {
                if (  frmbkup.top().type == CT_MEMBER
                   && frm.top().type == CT_MEMBER)
@@ -984,20 +983,30 @@ void indent_text(void)
          }
          frm.push(pp_next, __func__, __LINE__);
 
-         if (  get_chunk_parent_type(pc) == CT_PP_DEFINE
-            || get_chunk_parent_type(pc) == CT_PP_UNDEF)
+         if (  pc->GetParentType() == CT_PP_DEFINE
+            || 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().indent = frm.top().indent_tmp + indent_size;
+
+            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();
+            }
+            else
+            {
+               frm.top().indent = pc->GetColumn() + options::pp_multiline_define_body_indent();
+            }
             log_indent();
 
             frm.top().indent_tab = frm.top().indent;
             log_indent_tmp();
          }
-         else if (  (  get_chunk_parent_type(pc) == CT_PP_PRAGMA
-                    || get_chunk_parent_type(pc) == CT_PP_OTHER)
+         else if (  (  pc->GetParentType() == CT_PP_PRAGMA
+                    || pc->GetParentType() == CT_PP_OTHER)
                  && options::pp_define_at_level())
          {
             log_rule_B("pp_define_at_level");
@@ -1008,7 +1017,7 @@ void indent_text(void)
             frm.top().indent_tab = frm.top().indent;
             log_indent_tmp();
          }
-         else if (  get_chunk_parent_type(pc) == CT_PP_INCLUDE
+         else if (  pc->GetParentType() == CT_PP_INCLUDE
                  && options::pp_include_at_level())
          {
             log_rule_B("pp_include_at_level");
@@ -1036,18 +1045,18 @@ void indent_text(void)
             log_indent();
 
 
-            auto val = 0;
+            int val = 0;
 
-            if (  get_chunk_parent_type(pc) == CT_PP_REGION
-               || get_chunk_parent_type(pc) == CT_PP_ENDREGION)
+            if (  pc->GetParentType() == CT_PP_REGION
+               || pc->GetParentType() == CT_PP_ENDREGION)
             {
                log_rule_B("pp_indent_region");
                val = options::pp_indent_region();
                log_indent();
             }
-            else if (  get_chunk_parent_type(pc) == CT_PP_IF
-                    || get_chunk_parent_type(pc) == CT_PP_ELSE
-                    || get_chunk_parent_type(pc) == CT_PP_ENDIF)
+            else if (  pc->GetParentType() == CT_PP_IF
+                    || pc->GetParentType() == CT_PP_ELSE
+                    || pc->GetParentType() == CT_PP_ENDIF)
             {
                log_rule_B("pp_indent_if");
                val = options::pp_indent_if();
@@ -1056,10 +1065,10 @@ void indent_text(void)
 
             if (val != 0)
             {
-               auto &indent = frm.top().indent;
+               size_t &indent = frm.top().indent;
 
                indent = (val > 0) ? val                     // reassign if positive val,
-                        : (cast_abs(indent, val) < indent)  // else if no underflow
+                        : ((size_t)(abs(val)) < indent)     // else if no underflow
                         ? (indent + val) : 0;               // reduce, else 0
             }
             frm.top().indent_tmp = frm.top().indent;
@@ -1071,19 +1080,18 @@ void indent_text(void)
 
       if (options::indent_xml_string() > 0)
       {
-         if (chunk_is_token(pc, CT_STRING))
+         if (pc->Is(CT_STRING))
          {
             if (  pc->Len() > 4
                && xml_indent > 0
-               && pc->str[1] == '<'
-               && pc->str[2] == '/')
+               && pc->GetStr()[1] == '<'
+               && pc->GetStr()[2] == '/')
             {
                log_rule_B("indent_xml_string");
                xml_indent -= options::indent_xml_string();
             }
          }
-         else if (  !pc->IsComment()
-                 && !chunk_is_newline(pc))
+         else if (!pc->IsCommentOrNewline())
          {
             xml_indent = 0;
          }
@@ -1099,27 +1107,26 @@ void indent_text(void)
          old_frm_size = frm.size();
 
          // End anything that drops a level
-         if (  !chunk_is_newline(pc)
-            && !pc->IsComment()
-            && frm.top().level > pc->level)
+         if (  !pc->IsCommentOrNewline()
+            && frm.top().level > 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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->level)
+         if (frm.top().level >= pc->GetLevel())
          {
             // process virtual braces closes (no text output)
-            if (  chunk_is_token(pc, CT_VBRACE_CLOSE)
+            if (  pc->Is(CT_VBRACE_CLOSE)
                && frm.top().type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
                pc = pc->GetNext();
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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 (pc->IsNullChunk())
                {
@@ -1128,14 +1135,14 @@ void indent_text(void)
                }
             }
 
-            if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-               && get_chunk_parent_type(pc) == CT_ENUM)
+            if (  pc->Is(CT_BRACE_CLOSE)
+               && pc->GetParentType() == CT_ENUM)
             {
                Chunk *prev_ncnl = pc->GetPrevNcNnl();
-               LOG_FMT(LINDLINE, "%s(%d): prev_ncnl is '%s', prev_ncnl->orig_line is %zu, prev_ncnl->orig_col is %zu\n",
-                       __func__, __LINE__, prev_ncnl->Text(), prev_ncnl->orig_line, prev_ncnl->orig_col);
+               LOG_FMT(LINDLINE, "%s(%d): prev_ncnl is '%s', orig line is %zu, orig col is %zu\n",
+                       __func__, __LINE__, prev_ncnl->Text(), prev_ncnl->GetOrigLine(), prev_ncnl->GetOrigCol());
 
-               if (chunk_is_token(prev_ncnl, CT_COMMA))
+               if (prev_ncnl->Is(CT_COMMA))
                {
                   LOG_FMT(LINDLINE, "%s(%d): prev_ncnl is comma\n", __func__, __LINE__);
                }
@@ -1148,8 +1155,8 @@ void indent_text(void)
             // End any assign operations with a semicolon on the same level
             if (is_end_of_assignment(pc, frm))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
             // Pop Colon from stack in ternary operator
@@ -1160,84 +1167,84 @@ void indent_text(void)
 
             if (  options::indent_inside_ternary_operator()
                && (frm.top().type == CT_COND_COLON)
-               && (  chunk_is_semicolon(pc)
-                  || chunk_is_token(pc, CT_COMMA)
-                  || chunk_is_token(pc, CT_OC_MSG_NAME)
-                  || chunk_is_token(pc, CT_SPAREN_CLOSE))) // Issue #1130, #1715
+               && (  pc->IsSemicolon()
+                  || pc->Is(CT_COMMA)
+                  || pc->Is(CT_OC_MSG_NAME)
+                  || pc->Is(CT_SPAREN_CLOSE))) // Issue #1130, #1715
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // End any assign operations with a semicolon on the same level
-            if (  chunk_is_semicolon(pc)
+            if (  pc->IsSemicolon()
                && (  (frm.top().type == CT_IMPORT)
                   || (frm.top().type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // End any custom macro-based open/closes
             if (  !token_used
                && (frm.top().type == CT_MACRO_OPEN)
-               && chunk_is_token(pc, CT_MACRO_CLOSE))
+               && pc->Is(CT_MACRO_CLOSE))
             {
                token_used = true;
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // End any CPP/ObjC class colon stuff
             if (  (  (frm.top().type == CT_CLASS_COLON)
                   || (frm.top().type == CT_CONSTR_COLON))
-               && (  chunk_is_token(pc, CT_BRACE_OPEN)
-                  || chunk_is_token(pc, CT_OC_END)
-                  || chunk_is_token(pc, CT_OC_SCOPE)
-                  || chunk_is_token(pc, CT_OC_PROPERTY)
-                  || chunk_is_token(pc, CT_TYPEDEF) // Issue #2675
-                  || chunk_is_token(pc, CT_MACRO_OPEN)
-                  || chunk_is_token(pc, CT_MACRO_CLOSE)
+               && (  pc->Is(CT_BRACE_OPEN)
+                  || pc->Is(CT_OC_END)
+                  || pc->Is(CT_OC_SCOPE)
+                  || pc->Is(CT_OC_PROPERTY)
+                  || pc->Is(CT_TYPEDEF) // Issue #2675
+                  || pc->Is(CT_MACRO_OPEN)
+                  || pc->Is(CT_MACRO_CLOSE)
                   || (  language_is_set(LANG_OC)
                      && pc->IsComment()
-                     && get_chunk_parent_type(pc) == CT_COMMENT_WHOLE) // Issue #2675
-                  || chunk_is_semicolon(pc)))
+                     && pc->GetParentType() == CT_COMMENT_WHOLE) // Issue #2675
+                  || pc->IsSemicolon()))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // End ObjC class colon stuff inside of generic definition (like Test<T1: id<T3>>)
             if (  (frm.top().type == CT_CLASS_COLON)
-               && chunk_is_token(pc, CT_ANGLE_CLOSE)
-               && get_chunk_parent_type(pc) == CT_OC_GENERIC_SPEC)
+               && pc->Is(CT_ANGLE_CLOSE)
+               && pc->GetParentType() == CT_OC_GENERIC_SPEC)
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // End Objc nested message and boxed array
             // TODO: ideally formatting would know which opens occurred on a line and group closes in the same manor
             if (  language_is_set(LANG_OC)
-               && chunk_is_token(pc, CT_SQUARE_CLOSE)
-               && get_chunk_parent_type(pc) == CT_OC_AT
-               && frm.top().level >= pc->level)
+               && pc->Is(CT_SQUARE_CLOSE)
+               && pc->GetParentType() == CT_OC_AT
+               && frm.top().level >= pc->GetLevel())
             {
                size_t count = 1;
                Chunk  *next = pc->GetNextNc();
 
                while (  next->IsNotNullChunk()
-                     && (  (  chunk_is_token(next, CT_BRACE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_MSG)))
+                     && (  (  next->Is(CT_BRACE_CLOSE)
+                           && next->GetParentType() == CT_OC_AT)
+                        || (  next->Is(CT_SQUARE_CLOSE)
+                           && next->GetParentType() == CT_OC_AT)
+                        || (  next->Is(CT_SQUARE_CLOSE)
+                           && next->GetParentType() == CT_OC_MSG)))
                {
                   count++;
                   next = next->GetNextNc();
@@ -1253,14 +1260,14 @@ void indent_text(void)
                         if (frm.paren_count == 0)
                         {
                            fprintf(stderr, "%s(%d): frm.paren_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                                   __func__, __LINE__, pc->orig_line, pc->orig_col);
+                                   __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                            log_flush(true);
                            exit(EX_SOFTWARE);
                         }
                         frm.paren_count--;
                      }
-                     LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                             __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+                     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);
                   }
 
@@ -1269,8 +1276,8 @@ void indent_text(void)
                      // End any assign operations with a semicolon on the same level
                      if (is_end_of_assignment(next, frm))
                      {
-                        LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+                        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);
                      }
                   }
@@ -1282,38 +1289,38 @@ void indent_text(void)
 
             // a case is ended with another case or a close brace
             if (  (frm.top().type == CT_CASE)
-               && (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                  || chunk_is_token(pc, CT_CASE)))
+               && (  pc->Is(CT_BRACE_CLOSE)
+                  || pc->Is(CT_CASE)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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().pop_pc != nullptr)
+            if (frm.top().pop_pc->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->orig_line, frm.top().pop_pc->orig_col,
-                       frm.top().pop_pc->Text(), get_token_name(frm.top().pop_pc->type));
+               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()));
             }
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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)
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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)
-               && (  chunk_is_token(pc, CT_SEMICOLON)
-                  || chunk_is_token(pc, CT_COMMA)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)))
+               && (  pc->Is(CT_SEMICOLON)
+                  || pc->Is(CT_COMMA)
+                  || pc->Is(CT_BRACE_OPEN)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
             // a class scope is ended with another class scope or a close brace
@@ -1321,31 +1328,31 @@ void indent_text(void)
 
             if (  options::indent_access_spec_body()
                && (frm.top().type == CT_ACCESS)
-               && (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                  || chunk_is_token(pc, CT_ACCESS)))
+               && (  pc->Is(CT_BRACE_CLOSE)
+                  || pc->Is(CT_ACCESS)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // return & throw are ended with a semicolon
-            if (  chunk_is_semicolon(pc)
+            if (  pc->IsSemicolon()
                && (  (frm.top().type == CT_RETURN)
                   || (frm.top().type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // an OC SCOPE ('-' or '+') ends with a semicolon or brace open
             if (  (frm.top().type == CT_OC_SCOPE)
-               && (  chunk_is_semicolon(pc)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)))
+               && (  pc->IsSemicolon()
+                  || pc->Is(CT_BRACE_OPEN)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
@@ -1354,32 +1361,32 @@ void indent_text(void)
              * brace open
              */
             if (  (frm.top().type == CT_TYPEDEF)
-               && (  chunk_is_semicolon(pc)
-                  || chunk_is_paren_open(pc)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)))
+               && (  pc->IsSemicolon()
+                  || pc->IsParenOpen()
+                  || pc->Is(CT_BRACE_OPEN)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // an SQL EXEC is ended with a semicolon
             if (  (frm.top().type == CT_SQL_EXEC)
-               && chunk_is_semicolon(pc))
+               && pc->IsSemicolon())
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // an CLASS is ended with a semicolon or brace open
             if (  (frm.top().type == CT_CLASS)
-               && (  chunk_is_token(pc, CT_CLASS_COLON)
-                  || chunk_is_token(pc, CT_BRACE_OPEN)
-                  || chunk_is_semicolon(pc)))
+               && (  pc->Is(CT_CLASS_COLON)
+                  || pc->Is(CT_BRACE_OPEN)
+                  || pc->IsSemicolon()))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
             log_rule_B("indent_oc_inside_msg_sel");
@@ -1387,32 +1394,32 @@ void indent_text(void)
             // Pop OC msg selector stack
             if (  options::indent_oc_inside_msg_sel()
                && (frm.top().type != CT_SQUARE_OPEN)
-               && frm.top().level >= pc->level
-               && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
-                  || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
+               && frm.top().level >= pc->GetLevel()
+               && (  pc->Is(CT_OC_MSG_FUNC)
+                  || pc->Is(CT_OC_MSG_NAME))) // Issue #2658
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
 
             // Close out parenthesis and squares
-            if (  (frm.top().type == (pc->type - 1))
-               && (  chunk_is_token(pc, CT_PAREN_CLOSE)
-                  || chunk_is_token(pc, CT_LPAREN_CLOSE)                     // Issue #3054
-                  || chunk_is_token(pc, CT_SPAREN_CLOSE)
-                  || chunk_is_token(pc, CT_FPAREN_CLOSE)
-                  || chunk_is_token(pc, CT_SQUARE_CLOSE)
-                  || chunk_is_token(pc, CT_ANGLE_CLOSE)))
-            {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            if (  (frm.top().type == (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_SQUARE_CLOSE)
+                  || pc->Is(CT_ANGLE_CLOSE)))
+            {
+               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)
                {
                   fprintf(stderr, "%s(%d): frm.paren_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
+                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                   log_flush(true);
                   exit(EX_SOFTWARE);
                }
@@ -1427,50 +1434,49 @@ void indent_text(void)
 
       log_rule_B("indent_single_newlines");
 
-      if (  chunk_is_token(pc, CT_NEWLINE)
+      if (  pc->Is(CT_NEWLINE)
          && options::indent_single_newlines())
       {
-         pc->nl_column = indent_column;
+         pc->SetNlColumn(indent_column);
       }
 
-      if (  !chunk_is_newline(pc)
-         && !pc->IsComment()
+      if (  !pc->IsCommentOrNewline()
          && log_sev_on(LINDPC))
       {
          LOG_FMT(LINDPC, "%s(%d):\n", __func__, __LINE__);
-         LOG_FMT(LINDPC, "   -=[ pc->orig_line is %zu, orig_col is %zu, Text() is '%s' ]=-, frm.size() is %zu\n",
-                 pc->orig_line, pc->orig_col, pc->Text(), frm.size());
+         LOG_FMT(LINDPC, "   -=[ pc orig line is %zu, orig col is %zu, Text() is '%s' ]=-, frm.size() is %zu\n",
+                 pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), frm.size());
 
          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_cont=%d level=%zu pc brace level=%zu]\n",
                     ttidx,
-                    frm.at(ttidx).pc->orig_line,
-                    frm.at(ttidx).pc->orig_col,
+                    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->parent_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->brace_level);
+                    frm.at(ttidx).pc->GetBraceLevel());
          }
       }
       char copy[1000];
-      LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->ElidedText(copy));
+      LOG_FMT(LINDENT2, "%s(%d): orig line is %zu, orig col is %zu, column is %zu, Text() is '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetColumn(), pc->ElidedText(copy));
 
       // Issue #672
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
+      if (  pc->Is(CT_BRACE_OPEN)
          && classFound)
       {
          LOG_FMT(LINDENT, "%s(%d): CT_BRACE_OPEN found, CLOSE IT\n",
                  __func__, __LINE__);
-         LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         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()));
          classFound = false;
       }
       /*
@@ -1492,37 +1498,35 @@ void indent_text(void)
       log_rule_B("indent_braces_no_func");
       log_rule_B("indent_braces_no_class");
       log_rule_B("indent_braces_no_struct");
-      const bool brace_indent = (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                                   || chunk_is_token(pc, CT_BRACE_OPEN))
+      const bool brace_indent = (  (  pc->Is(CT_BRACE_CLOSE)
+                                   || pc->Is(CT_BRACE_OPEN))
                                 && options::indent_braces()
                                 && (  !options::indent_braces_no_func()
-                                   || get_chunk_parent_type(pc) != CT_FUNC_DEF)
+                                   || pc->GetParentType() != CT_FUNC_DEF)
                                 && (  !options::indent_braces_no_func()
-                                   || get_chunk_parent_type(pc) != CT_FUNC_CLASS_DEF)
+                                   || pc->GetParentType() != CT_FUNC_CLASS_DEF)
                                 && (  !options::indent_braces_no_class()
-                                   || get_chunk_parent_type(pc) != CT_CLASS)
+                                   || pc->GetParentType() != CT_CLASS)
                                 && (  !options::indent_braces_no_struct()
-                                   || get_chunk_parent_type(pc) != CT_STRUCT));
+                                   || pc->GetParentType() != CT_STRUCT));
       LOG_FMT(LINDENT, "%s(%d): brace_indent is %s\n",
-              __func__, __LINE__, brace_indent ? "TRue" : "FAlse");
+              __func__, __LINE__, brace_indent ? "true" : "false");
 
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
+      if (pc->Is(CT_BRACE_CLOSE))
       {
          if (language_is_set(LANG_OC))
          {
             if (  frm.top().type == CT_BRACE_OPEN
-               && frm.top().level >= pc->level)
+               && frm.top().level >= pc->GetLevel())
             {
                size_t count = 1;
                Chunk  *next = pc->GetNextNc();
 
                while (  next->IsNotNullChunk()
-                     && (  (  chunk_is_token(next, CT_BRACE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
-                           && get_chunk_parent_type(next) == CT_OC_MSG)))
+                     && (  (  next->Is(CT_BRACE_CLOSE)
+                           && next->GetParentType() == CT_OC_AT)
+                        || (  next->Is(CT_SQUARE_CLOSE)
+                           && next->GetParentType() == CT_OC_AT)))
                {
                   count++;
                   next = next->GetNextNc();
@@ -1532,19 +1536,18 @@ void indent_text(void)
                // End Objc nested boxed dictionary
                // TODO: ideally formatting would know which opens occurred on a line and group closes in the same manor
                if (  count > 0
-                  && chunk_is_token(pc, CT_BRACE_CLOSE)
-                  && get_chunk_parent_type(pc) == CT_OC_AT)
+                  && pc->Is(CT_BRACE_CLOSE)
+                  && pc->GetParentType() == CT_OC_AT)
                {
                   if (frm.top().ip.ref)
                   {
-                     pc->indent.ref   = frm.top().ip.ref;
-                     pc->indent.delta = 0;
+                     pc->IndentData().ref   = frm.top().ip.ref;
+                     pc->IndentData().delta = 0;
                   }
 
                   while (count-- > 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+                     LOG_CHUNK(LINDLINE, pc);
                      frm.pop(__func__, __LINE__, pc);
                   }
 
@@ -1553,8 +1556,7 @@ void indent_text(void)
                      // End any assign operations with a semicolon on the same level
                      if (is_end_of_assignment(next, frm))
                      {
-                        LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+                        LOG_CHUNK(LINDLINE, pc);
                         frm.pop(__func__, __LINE__, pc);
                      }
                   }
@@ -1576,11 +1578,11 @@ void indent_text(void)
 
                   if (frm.top().ip.ref)
                   {
-                     pc->indent.ref   = frm.top().ip.ref;
-                     pc->indent.delta = 0;
+                     pc->IndentData().ref   = frm.top().ip.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",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+                  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);
                }
             }
@@ -1592,15 +1594,15 @@ void indent_text(void)
 
             if (frm.top().ip.ref)
             {
-               pc->indent.ref   = frm.top().ip.ref;
-               pc->indent.delta = 0;
+               pc->IndentData().ref   = frm.top().ip.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",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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);
          }
       }
-      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
+      else if (pc->Is(CT_VBRACE_OPEN))
       {
          frm.push(pc, __func__, __LINE__);
 
@@ -1628,12 +1630,11 @@ void indent_text(void)
          // Always indent on virtual braces
          indent_column_set(frm.top().indent_tmp);
       }
-      else if (  chunk_is_token(pc, CT_BRACE_OPEN)
-              && (  pc->next != nullptr
-                 && pc->next->type != CT_NAMESPACE))
+      else if (  pc->Is(CT_BRACE_OPEN)
+              && pc->GetNext()->IsNot(CT_NAMESPACE))
       {
-         LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+         LOG_FMT(LINDENT2, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
          frm.push(pc, __func__, __LINE__);
 
          log_rule_B("indent_macro_brace");
@@ -1645,41 +1646,41 @@ void indent_text(void)
             LOG_FMT(LINDENT2, "%s(%d): indent_macro_brace\n", __func__, __LINE__);
          }
          else if (  options::indent_cpp_lambda_body()
-                 && get_chunk_parent_type(pc) == CT_CPP_LAMBDA)
+                 && pc->GetParentType() == CT_CPP_LAMBDA)
          {
             log_rule_B("indent_cpp_lambda_body");
             frm.top().brace_indent = frm.prev().indent;
 
             Chunk *head     = frm.top().pc->GetPrevNcNnlNpp();
-            Chunk *tail     = nullptr;
+            Chunk *tail     = Chunk::NullChunkPtr;
             Chunk *frm_prev = frm.prev().pc;
-            bool  enclosure = (  frm_prev->parent_type != CT_FUNC_DEF           // Issue #3407
-                              && frm_prev != chunk_skip_to_match(frm_prev));
+            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 == nullptr; ++it)
+            for (auto it = frm.rbegin(); it != frm.rend() && tail->IsNullChunk(); ++it)
             {
                if (it->pc && it->pc != frm.top().pc)
                {
-                  linematch &= are_chunks_in_same_line(it->pc, head);
+                  linematch &= it->pc->IsOnSameLine(head);
                }
-               Chunk *match = chunk_skip_to_match(it->pc);
+               Chunk *match = it->pc->GetClosingParen();
 
-               if (match == nullptr)
+               if (match->IsNullChunk())
                {
                   continue;
                }
                Chunk *target = match->GetNextNcNnlNpp();
 
-               while (  tail == nullptr
+               while (  tail->IsNullChunk()
                      && target->IsNotNullChunk())
                {
-                  if (  chunk_is_semicolon(target)
-                     && target->level == match->level)
+                  if (  target->IsSemicolon()
+                     && target->GetLevel() == match->GetLevel())
                   {
                      tail = target;
                   }
-                  else if (target->level < match->level)
+                  else if (target->GetLevel() < match->GetLevel())
                   {
                      break;
                   }
@@ -1692,73 +1693,42 @@ void indent_text(void)
 
             bool toplevel = true;
 
-            for (auto it = frm.rbegin(); it != frm.rend() && tail != nullptr; ++it)
+            for (auto it = frm.rbegin(); it != frm.rend() && tail->IsNotNullChunk(); ++it)
             {
-               if (!chunk_is_token(it->pc, CT_FPAREN_OPEN))
+               if (!it->pc->Is(CT_FPAREN_OPEN))
                {
                   continue;
                }
 
-               if (it->pc->level < tail->level)
+               if (it->pc->GetLevel() < tail->GetLevel())
                {
                   toplevel = false;
                   break;
                }
             }
 
-            // Issues: #1813, #3409, #3428
-            // if enclosure is set, the namespace is already accounted for
-            // so don't apply the correction twice.
-            // And for some reason, it's also accounted for when
-            // indent_namespace_single_indent is set
-            if (!enclosure && !options::indent_namespace_single_indent())
-            {
-               size_t namespace_indent_to_ignore = 0;
-               log_rule_B("indent_namespace");
-
-               for (auto i = frm.rbegin(); i != frm.rend(); ++i)
-               {
-                  if (i->ns_cnt)
-                  {
-                     const auto foo = i->ns_cnt;
-                     namespace_indent_to_ignore = indent_size * foo;
-                     break;
-                  }
-               }
-
-               if (namespace_indent_to_ignore && options::indent_namespace())
-               {
-                  // I honestly don't know what's going on, so this is an
-                  // emperical fix. For some reason lambda's don't have
-                  // their indent calculated properly when indent_namespace
-                  // is true. But only if they are not in enclosures.
-                  namespace_indent_to_ignore = indent_size;
-               }
-
-               if (namespace_indent_to_ignore <= frm.top().brace_indent)
-               {
-                  frm.top().brace_indent -= namespace_indent_to_ignore;
-               }
-               else
-               {
-                  frm.top().brace_indent = 1;
-               }
-            }
-
             // A few things to check:
             // 1. The matching brace is on the same line as the ending semicolon
             // 2a. If it's an assignment, check that both sides of the assignment operator are on the same line
-            // 2b. If it's inside some closure, check that all the frames are on the same line, and it is in the top level closure
-            if (  options::indent_continue() > 0
-               && are_chunks_in_same_line(chunk_skip_to_match(frm.top().pc), tail)
-               && (  (  !enclosure
-                     && options::align_assign_span() == 0
-                     && !options::indent_align_assign()
-                     && are_chunks_in_same_line(frm.prev().pc->GetPrevNcNnlNpp(), frm.prev().pc)
-                     && are_chunks_in_same_line(frm.prev().pc, frm.prev().pc->GetNextNcNnlNpp()))
-                  || (  enclosure
-                     && linematch
-                     && toplevel)))
+            // 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 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());
+
+            bool closureSameLineTopLevel =
+               (options::indent_continue() > 0)
+               && enclosure
+               && linematch
+               && toplevel
+               && frm.top().pc->GetClosingParen()->IsOnSameLine(frm.top().pc);
+
+            if (sameLine && ((isAssignSameLine) || (closureSameLineTopLevel)))
             {
                if (indent_size > frm.top().brace_indent)       // if options::indent_indent_columns() is too big
                {
@@ -1782,7 +1752,7 @@ void indent_text(void)
          }
          else if (  language_is_set(LANG_CPP)
                  && options::indent_cpp_lambda_only_once()
-                 && (get_chunk_parent_type(pc) == CT_CPP_LAMBDA))
+                 && (pc->GetParentType() == CT_CPP_LAMBDA))
          {
             // test example cpp:30756
             log_rule_B("indent_cpp_lambda_only_once");
@@ -1802,7 +1772,7 @@ void indent_text(void)
                }
             }
             // Issue # 1296
-            frm.top().brace_indent = 1 + ((pc->brace_level - namespace_indent_to_ignore) * indent_size);
+            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;
             log_indent();
@@ -1815,11 +1785,11 @@ void indent_text(void)
          }
          else if (  language_is_set(LANG_CS | LANG_JAVA)
                  && options::indent_cs_delegate_brace()
-                 && (  get_chunk_parent_type(pc) == CT_LAMBDA
-                    || get_chunk_parent_type(pc) == CT_DELEGATE))
+                 && (  pc->GetParentType() == CT_LAMBDA
+                    || pc->GetParentType() == CT_DELEGATE))
          {
             log_rule_B("indent_cs_delegate_brace");
-            frm.top().brace_indent = 1 + ((pc->brace_level + 1) * indent_size);
+            frm.top().brace_indent = 1 + ((pc->GetBraceLevel() + 1) * indent_size);
             indent_column_set(frm.top().brace_indent);
             frm.top().indent = indent_column + indent_size;
             log_indent();
@@ -1833,15 +1803,15 @@ void indent_text(void)
          else if (  language_is_set(LANG_CS | LANG_JAVA)
                  && !options::indent_cs_delegate_brace()
                  && !options::indent_align_paren()
-                 && (  get_chunk_parent_type(pc) == CT_LAMBDA
-                    || get_chunk_parent_type(pc) == CT_DELEGATE))
+                 && (  pc->GetParentType() == CT_LAMBDA
+                    || pc->GetParentType() == CT_DELEGATE))
          {
             log_rule_B("indent_cs_delegate_brace");
             log_rule_B("indent_align_paren");
             frm.top().brace_indent = frm.prev().indent;
 
             // Issue # 1620, UNI-24090.cs
-            if (are_chunks_in_same_line(frm.prev().pc, frm.top().pc->GetPrevNcNnlNpp()))
+            if (frm.prev().pc->IsOnSameLine(frm.top().pc->GetPrevNcNnlNpp()))
             {
                frm.top().brace_indent -= indent_size;
             }
@@ -1856,16 +1826,16 @@ void indent_text(void)
          }
          else if (  !options::indent_paren_open_brace()
                  && !language_is_set(LANG_CS)
-                 && get_chunk_parent_type(pc) == CT_CPP_LAMBDA
-                 && (  pc->flags.test(PCF_IN_FCN_DEF)
-                    || pc->flags.test(PCF_IN_FCN_CTOR)) // Issue #2152
-                 && chunk_is_newline(pc->GetNextNc()))
+                 && pc->GetParentType() == CT_CPP_LAMBDA
+                 && (  pc->TestFlags(PCF_IN_FCN_DEF)
+                    || pc->TestFlags(PCF_IN_FCN_CTOR)) // Issue #2152
+                 && pc->GetNextNc()->IsNewline())
          {
             log_rule_B("indent_paren_open_brace");
             // Issue #1165
-            LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->brace_level is %zu, for '%s', pc->level is %zu, pc(-1)->level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->brace_level, pc->Text(), pc->level, frm.prev().pc->level);
-            frm.top().brace_indent = 1 + ((pc->brace_level + 1) * indent_size);
+            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;
             log_indent();
@@ -1876,20 +1846,20 @@ void indent_text(void)
          // any '{' that is inside of a '(' overrides the '(' indent
          // only to help the vim command }
          else if (  !options::indent_paren_open_brace()
-                 && chunk_is_paren_open(frm.prev().pc)
-                 && chunk_is_newline(pc->GetNextNc()))
+                 && frm.prev().pc->IsParenOpen()
+                 && pc->GetNextNc()->IsNewline())
          {
             log_rule_B("indent_paren_open_brace");
-            LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->brace_level is %zu, for '%s', pc->level is %zu, pc(-1)->level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->brace_level, pc->Text(), pc->level, frm.prev().pc->level);
+            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());
             // FIXME: I don't know how much of this is necessary, but it seems to work
-            frm.top().brace_indent = 1 + (pc->brace_level * indent_size);
+            frm.top().brace_indent = 1 + (pc->GetBraceLevel() * indent_size);
             indent_column_set(frm.top().brace_indent);
             frm.top().indent = indent_column + indent_size;
             log_indent();
 
-            if (  (get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR)
-               && pc->flags.test(PCF_IN_OC_MSG))
+            if (  (pc->GetParentType() == CT_OC_BLOCK_EXPR)
+               && pc->TestFlags(PCF_IN_OC_MSG))
             {
                frm.top().indent = frm.prev().indent_tmp + indent_size;
                log_indent();
@@ -1902,13 +1872,14 @@ void indent_text(void)
 
             frm.prev().indent_tmp = frm.top().indent_tmp;
          }
-         else if (frm.paren_count != 0)
+         else if (  frm.paren_count != 0
+                 && !pc->TestFlags(PCF_IN_LAMBDA)) // Issue #3761
          {
-            if (frm.top().pc->parent_type == CT_OC_BLOCK_EXPR)
+            if (frm.top().pc->GetParentType() == CT_OC_BLOCK_EXPR)
             {
                log_rule_B("indent_oc_block_msg");
 
-               if (  pc->flags.test(PCF_IN_OC_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);
@@ -1921,7 +1892,7 @@ void indent_text(void)
                if (  options::indent_oc_block()
                   || options::indent_oc_block_msg_xcode_style())
                {
-                  bool in_oc_msg = pc->flags.test(PCF_IN_OC_MSG);
+                  bool in_oc_msg = pc->TestFlags(PCF_IN_OC_MSG);
                   log_rule_B("indent_oc_block_msg_from_keyword");
                   bool indent_from_keyword = options::indent_oc_block_msg_from_keyword()
                                              && in_oc_msg;
@@ -1945,11 +1916,11 @@ void indent_text(void)
 
                   if (options::indent_oc_block_msg_xcode_style())
                   {
-                     Chunk *bbc           = chunk_skip_to_match(pc); // block brace close '}'
+                     Chunk *bbc           = pc->GetClosingParen(); // block brace close '}'
                      Chunk *bbc_next_ncnl = bbc->GetNextNcNnl();
 
-                     if (  bbc_next_ncnl->type == CT_OC_MSG_NAME
-                        || bbc_next_ncnl->type == CT_OC_MSG_FUNC)
+                     if (  bbc_next_ncnl->GetType() == CT_OC_MSG_NAME
+                        || bbc_next_ncnl->GetType() == CT_OC_MSG_FUNC)
                      {
                         indent_from_brace   = false;
                         indent_from_colon   = false;
@@ -1971,11 +1942,11 @@ void indent_text(void)
 
                   if (ref)
                   {
-                     frm.top().indent = indent_size + ref->column;
+                     frm.top().indent = indent_size + ref->GetColumn();
                   }
                   else
                   {
-                     frm.top().indent = 1 + ((pc->brace_level + 1) * indent_size);
+                     frm.top().indent = 1 + ((pc->GetBraceLevel() + 1) * indent_size);
                   }
                   log_indent();
                   indent_column_set(frm.top().indent - indent_size);
@@ -1986,8 +1957,8 @@ void indent_text(void)
                   log_indent();
                }
             }
-            else if (  frm.top().pc->type == CT_BRACE_OPEN
-                    && frm.top().pc->parent_type == CT_OC_AT)
+            else if (  frm.top().pc->GetType() == CT_BRACE_OPEN
+                    && frm.top().pc->GetParentType() == CT_OC_AT)
             {
                // We are inside @{ ... } -- indent one tab from the paren
                if (frm.prev().indent_cont)
@@ -2001,10 +1972,10 @@ void indent_text(void)
                log_indent();
             }
             // Issue # 1620, UNI-24090.cs
-            else if (  are_chunks_in_same_line(frm.prev().pc, frm.top().pc)
+            else if (  frm.prev().pc->IsOnSameLine(frm.top().pc)
                     && !options::indent_align_paren()
-                    && chunk_is_paren_open(frm.prev().pc)
-                    && !pc->flags.test(PCF_ONE_LINER))
+                    && frm.prev().pc->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.
@@ -2014,10 +1985,10 @@ void indent_text(void)
                frm.top().indent = frm.prev().indent_tmp;
                log_indent();
             }
-            else if (  are_chunks_in_same_line(frm.prev().pc, frm.top().pc->GetPrevNcNnlNpp())
+            else if (  frm.prev().pc->IsOnSameLine(frm.top().pc->GetPrevNcNnlNpp())
                     && !options::indent_align_paren()
-                    && chunk_is_paren_open(frm.prev().pc)
-                    && !pc->flags.test(PCF_ONE_LINER))
+                    && frm.prev().pc->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.
@@ -2033,24 +2004,29 @@ void indent_text(void)
             {
                log_rule_B("indent_oc_inside_msg_sel");
                // [Class Message:{<here>
-               frm.top().indent = frm.prev().pc->column + indent_size;
+               frm.top().indent = frm.prev().pc->GetColumn() + indent_size;
                log_indent();
-               indent_column_set(frm.prev().pc->column);
+               indent_column_set(frm.prev().pc->GetColumn());
+            }
+            // Issue #3813
+            else if (pc->TestFlags(PCF_OC_IN_BLOCK) && pc->GetParentType() == CT_SWITCH)
+            {
+               frm.top().indent = frm.prev().indent_tmp;
             }
             else
             {
                // We are inside ({ ... }) -- indent one tab from the paren
                frm.top().indent = frm.prev().indent_tmp + indent_size;
 
-               if (!chunk_is_paren_open(frm.prev().pc))
+               if (!frm.prev().pc->IsParenOpen())
                {
                   frm.top().indent_tab = frm.top().indent;
                }
                log_indent();
             }
          }
-         else if (  frm.top().pc->type == CT_BRACE_OPEN
-                 && frm.top().pc->parent_type == CT_OC_AT)
+         else if (  frm.top().pc->GetType() == CT_BRACE_OPEN
+                 && frm.top().pc->GetParentType() == CT_OC_AT)
          {
             // We are inside @{ ... } -- indent one tab from the paren
             if (frm.prev().indent_cont)
@@ -2064,9 +2040,9 @@ void indent_text(void)
             }
             log_indent();
          }
-         else if (  (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
+         else if (  (  pc->GetParentType() == CT_BRACED_INIT_LIST
                     || (  !options::indent_compound_literal_return()
-                       && get_chunk_parent_type(pc) == CT_C_CAST))
+                       && pc->GetParentType() == CT_C_CAST))
                  && frm.prev().type == CT_RETURN)
          {
             log_rule_B("indent_compound_literal_return");
@@ -2086,7 +2062,7 @@ void indent_text(void)
          else
          {
             // Use the prev indent level + indent_size.
-            if (get_chunk_parent_type(pc) == CT_SWITCH)
+            if (pc->GetParentType() == CT_SWITCH)
             {
                frm.top().indent = frm.prev().indent + options::indent_switch_body();
             }
@@ -2096,22 +2072,22 @@ void indent_text(void)
             }
             LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, ... indent is %zu\n",
                     __func__, __LINE__, frm.size() - 1, frm.top().indent);
-            LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', parent_type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
-                    get_token_name(get_chunk_parent_type(pc)));
+            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()));
 
             // If this brace is part of a statement, bump it out by indent_brace
-            if (  get_chunk_parent_type(pc) == CT_IF
-               || get_chunk_parent_type(pc) == CT_ELSE
-               || get_chunk_parent_type(pc) == CT_ELSEIF
-               || get_chunk_parent_type(pc) == CT_TRY
-               || get_chunk_parent_type(pc) == CT_CATCH
-               || get_chunk_parent_type(pc) == CT_DO
-               || get_chunk_parent_type(pc) == CT_WHILE
-               || get_chunk_parent_type(pc) == CT_USING_STMT
-               || get_chunk_parent_type(pc) == CT_SWITCH
-               || get_chunk_parent_type(pc) == CT_SYNCHRONIZED
-               || get_chunk_parent_type(pc) == CT_FOR)
+            if (  pc->GetParentType() == CT_IF
+               || pc->GetParentType() == CT_ELSE
+               || pc->GetParentType() == CT_ELSEIF
+               || pc->GetParentType() == CT_TRY
+               || pc->GetParentType() == CT_CATCH
+               || pc->GetParentType() == CT_DO
+               || pc->GetParentType() == CT_WHILE
+               || pc->GetParentType() == CT_USING_STMT
+               || pc->GetParentType() == CT_SWITCH
+               || pc->GetParentType() == CT_SYNCHRONIZED
+               || pc->GetParentType() == CT_FOR)
             {
                if (parent_token_indent != 0)
                {
@@ -2126,12 +2102,12 @@ void indent_text(void)
                   indent_column_set(indent_column + options::indent_brace());
                }
             }
-            else if (get_chunk_parent_type(pc) == CT_CASE)
+            else if (pc->GetParentType() == CT_CASE)
             {
                if (options::indent_ignore_case_brace())
                {
                   log_rule_B("indent_ignore_case_brace");
-                  indent_column_set(pc->orig_col);
+                  indent_column_set(pc->GetOrigCol());
                }
                else
                {
@@ -2155,16 +2131,16 @@ void indent_text(void)
                frm.top().indent_tmp = frm.top().indent;
                log_indent_tmp();
             }
-            else if (  get_chunk_parent_type(pc) == CT_CLASS
+            else if (  pc->GetParentType() == CT_CLASS
                     && !options::indent_class())
             {
                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->orig_line, pc->orig_col, pc->Text());
+               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;
                log_indent();
             }
-            else if (get_chunk_parent_type(pc) == CT_NAMESPACE)
+            else if (pc->GetParentType() == CT_NAMESPACE)
             {
                frm.top().ns_cnt = frm.prev().ns_cnt + 1;
 
@@ -2192,7 +2168,7 @@ void indent_text(void)
                      log_indent();
                   }
                }
-               else if (  pc->flags.test(PCF_LONG_BLOCK)
+               else if (  pc->TestFlags(PCF_LONG_BLOCK)
                        || !options::indent_namespace())
                {
                   log_rule_B("indent_namespace");
@@ -2215,7 +2191,7 @@ void indent_text(void)
                   }
                }
             }
-            else if (  get_chunk_parent_type(pc) == CT_EXTERN
+            else if (  pc->GetParentType() == CT_EXTERN
                     && !options::indent_extern())
             {
                log_rule_B("indent_extern");
@@ -2225,12 +2201,12 @@ void indent_text(void)
             frm.top().indent_tab = frm.top().indent;
          }
 
-         if (pc->flags.test(PCF_DONT_INDENT))
+         if (pc->TestFlags(PCF_DONT_INDENT))
          {
-            frm.top().indent = pc->column;
+            frm.top().indent = pc->GetColumn();
             log_indent();
 
-            indent_column_set(pc->column);
+            indent_column_set(pc->GetColumn());
          }
          else
          {
@@ -2249,25 +2225,25 @@ void indent_text(void)
             }
             Chunk *prev = pc->GetPrev();
 
-            if (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
-               && chunk_is_token(prev, CT_BRACE_OPEN)
-               && get_chunk_parent_type(prev) == CT_BRACED_INIT_LIST)
+            if (  pc->GetParentType() == CT_BRACED_INIT_LIST
+               && prev->Is(CT_BRACE_OPEN)
+               && prev->GetParentType() == CT_BRACED_INIT_LIST)
             {
                indent_column = frm.prev().brace_indent;
                frm.top().indent = frm.prev().indent;
                log_indent();
             }
-            else if (  !chunk_is_newline_between(pc, next)
-                    && get_chunk_parent_type(next) != CT_BRACED_INIT_LIST
+            else if (  !pc->IsNewlineBetween(next)
+                    && next->GetParentType() != CT_BRACED_INIT_LIST
                     && options::indent_token_after_brace()
-                    && !pc->flags.test(PCF_ONE_LINER)) // Issue #1108
+                    && !pc->TestFlags(PCF_ONE_LINER)) // Issue #1108
             {
                log_rule_B("indent_token_after_brace");
-               frm.top().indent = next->column;
+               frm.top().indent = next->GetColumn();
                log_indent();
             }
             frm.top().indent_tmp = frm.top().indent;
-            frm.top().open_line  = pc->orig_line;
+            frm.top().open_line  = pc->GetOrigLine();
             log_indent_tmp();
 
             log_rule_B("Update the indent_column");
@@ -2283,20 +2259,20 @@ void indent_text(void)
          // Save the brace indent
          frm.top().brace_indent = indent_column;
       }
-      else if (chunk_is_token(pc, CT_SQL_END))
+      else if (pc->Is(CT_SQL_END))
       {
          if (frm.top().type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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);
             log_indent_tmp();
          }
       }
-      else if (  chunk_is_token(pc, CT_SQL_BEGIN)
-              || chunk_is_token(pc, CT_MACRO_OPEN)
-              || (  chunk_is_token(pc, CT_CLASS)
+      else if (  pc->Is(CT_SQL_BEGIN)
+              || pc->Is(CT_MACRO_OPEN)
+              || (  pc->Is(CT_CLASS)
                  && language_is_set(LANG_CS))) // Issue #3536
       {
          frm.push(pc, __func__, __LINE__);
@@ -2308,7 +2284,7 @@ void indent_text(void)
          frm.top().indent_tab = frm.top().indent;
          log_indent_tmp();
       }
-      else if (chunk_is_token(pc, CT_SQL_EXEC))
+      else if (pc->Is(CT_SQL_EXEC))
       {
          frm.push(pc, __func__, __LINE__);
 
@@ -2318,14 +2294,14 @@ void indent_text(void)
          frm.top().indent_tmp = frm.top().indent;
          log_indent_tmp();
       }
-      else if (chunk_is_token(pc, CT_MACRO_ELSE))
+      else if (pc->Is(CT_MACRO_ELSE))
       {
          if (frm.top().type == CT_MACRO_OPEN)
          {
             indent_column_set(frm.prev().indent);
          }
       }
-      else if (chunk_is_token(pc, CT_CASE))
+      else if (pc->Is(CT_CASE))
       {
          // Start a case - indent UO_indent_switch_case from the switch level
          log_rule_B("indent_switch_case");
@@ -2355,20 +2331,20 @@ void indent_text(void)
             {
                Chunk *t2 = pct->GetPrev();
 
-               if (chunk_is_newline(t2))
+               if (t2->IsNewline())
                {
-                  pct->column        = frm.top().indent_tmp;
-                  pct->column_indent = pct->column;
+                  pct->SetColumn(frm.top().indent_tmp);
+                  pct->SetColumnIndent(pct->GetColumn());
                }
             }
          }
       }
-      else if (chunk_is_token(pc, CT_BREAK))
+      else if (pc->Is(CT_BREAK))
       {
          Chunk *prev = pc->GetPrevNcNnl();
 
-         if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(prev) == CT_CASE)
+         if (  prev->Is(CT_BRACE_CLOSE)
+            && prev->GetParentType() == CT_CASE)
          {
             // issue #663 + issue #1366
             Chunk *prev_prev_newline = pc->GetPrevNl()->GetPrevNl();
@@ -2376,22 +2352,22 @@ void indent_text(void)
             if (prev_prev_newline->IsNotNullChunk())
             {
                // This only affects the 'break', so no need for a stack entry
-               indent_column_set(prev_prev_newline->GetNext()->column);
+               indent_column_set(prev_prev_newline->GetNext()->GetColumn());
             }
          }
       }
-      else if (chunk_is_token(pc, CT_LABEL))
+      else if (pc->Is(CT_LABEL))
       {
          if (options::indent_ignore_label())
          {
             log_rule_B("indent_ignore_label");
-            indent_column_set(pc->orig_col);
+            indent_column_set(pc->GetOrigCol());
          }
          else
          {
             log_rule_B("indent_label");
-            const auto val        = options::indent_label();
-            const auto pse_indent = frm.top().indent;
+            const int val        = options::indent_label();
+            size_t    pse_indent = frm.top().indent;
 
             // Labels get sent to the left or backed up
             if (val > 0)
@@ -2401,21 +2377,21 @@ void indent_text(void)
                Chunk *next = pc->GetNext()->GetNext();  // colon + possible statement
 
                if (  next->IsNotNullChunk()
-                  && !chunk_is_newline(next)
+                  && !next->IsNewline()
                      // label (+ 2, because there is colon and space after it) must fit into indent
-                  && (val + static_cast<int>(pc->Len()) + 2 <= static_cast<int>(pse_indent)))
+                  && (val + pc->Len() + 2 <= pse_indent))
                {
                   reindent_line(next, pse_indent);
                }
             }
             else
             {
-               const auto no_underflow = cast_abs(pse_indent, val) < pse_indent;
-               indent_column_set(((no_underflow) ? (pse_indent + val) : 0));
+               bool no_underflow = (size_t)(abs(val)) < pse_indent;
+               indent_column_set((no_underflow ? (pse_indent + val) : 0));
             }
          }
       }
-      else if (chunk_is_token(pc, CT_ACCESS))
+      else if (pc->Is(CT_ACCESS))
       {
          log_rule_B("indent_access_spec_body");
 
@@ -2443,14 +2419,14 @@ void indent_text(void)
 
             while (  ((pct = pct->GetPrevNnl())->IsNotNullChunk())
                   && pct->IsComment()
-                  && !chunk_is_Doxygen_comment(pct))
+                  && !pct->IsDoxygenComment())
             {
                Chunk *t2 = pct->GetPrev();
 
-               if (chunk_is_newline(t2))
+               if (t2->IsNewline())
                {
-                  pct->column        = frm.top().indent_tmp;
-                  pct->column_indent = pct->column;
+                  pct->SetColumn(frm.top().indent_tmp);
+                  pct->SetColumnIndent(pct->GetColumn());
                }
             }
          }
@@ -2458,7 +2434,7 @@ void indent_text(void)
          {
             // Access spec labels get sent to the left or backed up
             log_rule_B("indent_access_spec");
-            const auto val = options::indent_access_spec();
+            int val = options::indent_access_spec();
 
             if (val > 0)
             {
@@ -2466,15 +2442,15 @@ void indent_text(void)
             }
             else
             {
-               const auto pse_indent   = frm.top().indent;
-               const auto no_underflow = cast_abs(pse_indent, val) < pse_indent;
+               size_t pse_indent   = frm.top().indent;
+               bool   no_underflow = (size_t)(abs(val)) < pse_indent;
 
                indent_column_set(no_underflow ? (pse_indent + val) : 0);
             }
          }
       }
-      else if (  chunk_is_token(pc, CT_CLASS_COLON)
-              || chunk_is_token(pc, CT_CONSTR_COLON))
+      else if (  pc->Is(CT_CLASS_COLON)
+              || pc->Is(CT_CONSTR_COLON))
       {
          // just indent one level
          frm.push(pc, __func__, __LINE__);
@@ -2486,12 +2462,12 @@ void indent_text(void)
          frm.top().indent_tab = frm.top().indent;
          log_indent_tmp();
 
-         if (chunk_is_token(pc, CT_CLASS_COLON))
+         if (pc->Is(CT_CLASS_COLON))
          {
             if (options::indent_ignore_before_class_colon())
             {
                log_rule_B("indent_ignore_before_class_colon");
-               frm.top().indent_tmp = pc->orig_col;
+               frm.top().indent_tmp = pc->GetOrigCol();
                log_indent_tmp();
             }
             else if (options::indent_before_class_colon() != 0)
@@ -2506,13 +2482,13 @@ void indent_text(void)
          log_rule_B("indent_class_colon");
 
          if (  options::indent_class_colon()
-            && chunk_is_token(pc, CT_CLASS_COLON))
+            && pc->Is(CT_CLASS_COLON))
          {
             log_rule_B("indent_class_on_colon");
 
             if (options::indent_class_on_colon())
             {
-               frm.top().indent = pc->column;
+               frm.top().indent = pc->GetColumn();
                log_indent();
             }
             else
@@ -2520,19 +2496,19 @@ void indent_text(void)
                Chunk *next = pc->GetNext();
 
                if (  next->IsNotNullChunk()
-                  && !chunk_is_newline(next))
+                  && !next->IsNewline())
                {
-                  frm.top().indent = next->column;
+                  frm.top().indent = next->GetColumn();
                   log_indent();
                }
             }
          }
-         else if (chunk_is_token(pc, CT_CONSTR_COLON))
+         else if (pc->Is(CT_CONSTR_COLON))
          {
             if (options::indent_ignore_before_constr_colon())
             {
                log_rule_B("indent_ignore_before_constr_colon");
-               frm.top().indent_tmp = pc->orig_col;
+               frm.top().indent_tmp = pc->GetOrigCol();
                indent_column_set(frm.top().indent_tmp);
             }
 
@@ -2541,7 +2517,7 @@ void indent_text(void)
                log_rule_B("indent_constr_colon");
                Chunk *prev = pc->GetPrev();
 
-               if (chunk_is_newline(prev))
+               if (prev->IsNewline())
                {
                   log_rule_B("indent_ctor_init_following");
                   frm.top().indent += options::indent_ctor_init_following();
@@ -2568,7 +2544,7 @@ void indent_text(void)
                }
                else if (options::indent_class_on_colon())
                {
-                  frm.top().indent = pc->column;
+                  frm.top().indent = pc->GetColumn();
                   log_indent();
                }
                else
@@ -2576,50 +2552,53 @@ void indent_text(void)
                   Chunk *next = pc->GetNext();
 
                   if (  next->IsNotNullChunk()
-                     && !chunk_is_newline(next))
+                     && !next->IsNewline())
                   {
-                     frm.top().indent = next->column;
+                     frm.top().indent = next->GetColumn();
                      log_indent();
                   }
                }
             }
          }
       }
-      else if (  chunk_is_token(pc, CT_PAREN_OPEN)
-              && (  get_chunk_parent_type(pc) == CT_ASM
+      else if (  pc->Is(CT_PAREN_OPEN)
+              && (  pc->GetParentType() == CT_ASM
                  || (  pc->GetPrevNcNnl()->IsNotNullChunk()
-                    && pc->GetPrevNcNnl()->type == CT_ASM))
+                    && pc->GetPrevNcNnl()->GetType() == CT_ASM))
               && options::indent_ignore_asm_block())
       {
          log_rule_B("indent_ignore_asm_block");
-         Chunk *tmp = chunk_skip_to_match(pc);
+         Chunk *tmp = pc->GetClosingParen();
 
          int   move = 0;
 
-         if (  chunk_is_newline(pc->GetPrev())
-            && pc->column != indent_column)
+         if (  pc->GetPrev()->IsNewline()
+            && pc->GetColumn() != indent_column)
          {
-            move = indent_column - pc->column;
+            move = indent_column - pc->GetColumn();
          }
          else
          {
-            move = pc->column - pc->orig_col;
+            move = pc->GetColumn() - pc->GetOrigCol();
          }
 
          do
          {
-            pc->column = pc->orig_col + move;
-            pc         = pc->GetNext();
+            if (!pc->TestFlags(PCF_IN_PREPROC))
+            {
+               pc->SetColumn(pc->GetOrigCol() + move);
+            }
+            pc = pc->GetNext();
          } while (pc != tmp);
 
          reindent_line(pc, indent_column);
       }
-      else if (  chunk_is_token(pc, CT_PAREN_OPEN)
-              || chunk_is_token(pc, CT_LPAREN_OPEN)                     // Issue #3054
-              || chunk_is_token(pc, CT_SPAREN_OPEN)
-              || chunk_is_token(pc, CT_FPAREN_OPEN)
-              || chunk_is_token(pc, CT_SQUARE_OPEN)
-              || chunk_is_token(pc, 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_SQUARE_OPEN)
+              || pc->Is(CT_ANGLE_OPEN))
       {
          /*
           * Open parenthesis and squares - never update indent_column,
@@ -2627,18 +2606,18 @@ void indent_text(void)
           */
          frm.push(pc, __func__, __LINE__);
 
-         if (  chunk_is_newline(pc->GetPrev())
-            && pc->column != indent_column
-            && !pc->flags.test(PCF_DONT_INDENT))
+         if (  pc->GetPrev()->IsNewline()
+            && pc->GetColumn() != indent_column
+            && !pc->TestFlags(PCF_DONT_INDENT))
          {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent => %zu, text is '%s'\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+            LOG_FMT(LINDENT, "%s(%d): orig line is %zu, indent => %zu, text is '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         frm.top().indent = pc->column + pc->Len();
+         frm.top().indent = pc->GetColumn() + pc->Len();
          log_indent();
 
-         if (  chunk_is_token(pc, CT_SQUARE_OPEN)
+         if (  pc->Is(CT_SQUARE_OPEN)
             && language_is_set(LANG_D))
          {
             frm.top().indent_tab = frm.top().indent;
@@ -2648,8 +2627,8 @@ void indent_text(void)
          log_rule_B("indent_align_paren");
 
          if (  options::indent_inside_ternary_operator()
-            && (  chunk_is_token(pc, CT_FPAREN_OPEN)
-               || chunk_is_token(pc, CT_PAREN_OPEN))
+            && (  pc->Is(CT_FPAREN_OPEN)
+               || pc->Is(CT_PAREN_OPEN))
             && frm.size() > 2
             && (  frm.prev().type == CT_QUESTION
                || frm.prev().type == CT_COND_COLON)
@@ -2661,26 +2640,26 @@ void indent_text(void)
             frm.top().indent_tmp = frm.top().indent;
             log_indent_tmp();
          }
-         else if (  (  chunk_is_token(pc, CT_FPAREN_OPEN)
-                    || chunk_is_token(pc, CT_ANGLE_OPEN))
+         else if (  (  pc->Is(CT_FPAREN_OPEN)
+                    || pc->Is(CT_ANGLE_OPEN))
                  && (  (  options::indent_func_call_param()
-                       && (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-                          || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER))
+                       && (  pc->GetParentType() == CT_FUNC_CALL
+                          || pc->GetParentType() == CT_FUNC_CALL_USER))
                     || (  options::indent_func_proto_param()
-                       && get_chunk_parent_type(pc) == CT_FUNC_PROTO)
+                       && pc->GetParentType() == CT_FUNC_PROTO)
                     || (  options::indent_func_class_param()
-                       && (  get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                          || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO))
+                       && (  pc->GetParentType() == CT_FUNC_CLASS_DEF
+                          || pc->GetParentType() == CT_FUNC_CLASS_PROTO))
                     || (  options::indent_template_param()
-                       && get_chunk_parent_type(pc) == CT_TEMPLATE)
+                       && pc->GetParentType() == CT_TEMPLATE)
                     || (  options::indent_func_ctor_var_param()
-                       && get_chunk_parent_type(pc) == CT_FUNC_CTOR_VAR)
+                       && pc->GetParentType() == CT_FUNC_CTOR_VAR)
                     || (  options::indent_func_def_param()
-                       && get_chunk_parent_type(pc) == CT_FUNC_DEF)
+                       && pc->GetParentType() == CT_FUNC_DEF)
                     || (  !options::indent_func_def_param()          // Issue #931
-                       && get_chunk_parent_type(pc) == CT_FUNC_DEF
+                       && pc->GetParentType() == CT_FUNC_DEF
                        && options::indent_func_def_param_paren_pos_threshold() > 0
-                       && pc->orig_col > options::indent_func_def_param_paren_pos_threshold())))
+                       && pc->GetOrigCol() > options::indent_func_def_param_paren_pos_threshold())))
          {
             log_rule_B("indent_func_call_param");
             log_rule_B("indent_func_proto_param");
@@ -2706,16 +2685,16 @@ void indent_text(void)
                         && frm.at(idx).type != CT_COND_COLON
                         && frm.at(idx).type != CT_LAMBDA
                         && frm.at(idx).type != CT_ASSIGN_NL)
-                     || are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
+                     || 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()->type == CT_NEWLINE)))
+                         && frm.at(idx).pc->GetPrevNc()->GetType() == CT_NEWLINE)))
             {
                if (idx == 0)
                {
                   fprintf(stderr, "%s(%d): idx is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
+                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                   log_flush(true);
                   exit(EX_SOFTWARE);
                }
@@ -2746,7 +2725,7 @@ void indent_text(void)
             frm.top().indent_tab = frm.top().indent;
          }
          else if (  options::indent_oc_inside_msg_sel()
-                 && chunk_is_token(pc, CT_PAREN_OPEN)
+                 && pc->Is(CT_PAREN_OPEN)
                  && frm.size() > 2
                  && (  frm.prev().type == CT_OC_MSG_FUNC
                     || frm.prev().type == CT_OC_MSG_NAME)
@@ -2756,22 +2735,22 @@ void indent_text(void)
             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->column + indent_size;
+            frm.top().indent = frm.prev().pc->GetColumn() + indent_size;
             log_indent();
             frm.top().indent_tab = frm.top().indent;
             frm.top().indent_tmp = frm.top().indent;
             log_indent_tmp();
          }
-         else if (  chunk_is_token(pc, CT_PAREN_OPEN)
-                 && !chunk_is_newline(pc->GetNext())
+         else if (  pc->Is(CT_PAREN_OPEN)
+                 && !pc->GetNext()->IsNewline()
                  && !options::indent_align_paren()
-                 && !pc->flags.test(PCF_IN_SPAREN))
+                 && !pc->TestFlags(PCF_IN_SPAREN))
          {
             log_rule_B("indent_align_paren");
-            int idx = static_cast<int>(frm.size()) - 2;
+            size_t idx = frm.size() - 2;
 
             while (  idx > 0
-                  && are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
+                  && frm.at(idx).pc->IsOnSameLine(frm.top().pc))
             {
                idx--;
                skipped = true;
@@ -2782,11 +2761,11 @@ void indent_text(void)
             frm.top().indent_tab = frm.top().indent;
             skipped = true;
          }
-         else if (  (  chunk_is_str(pc, "(")
+         else if (  (  pc->IsString("(")
                     && !options::indent_paren_nl())
-                 || (  chunk_is_str(pc, "<")
+                 || (  pc->IsString("<")
                     && !options::indent_paren_nl())    // TODO: add indent_angle_nl?
-                 || (  chunk_is_str(pc, "[")
+                 || (  pc->IsString("[")
                     && !options::indent_square_nl()))
          {
             log_rule_B("indent_paren_nl");
@@ -2801,7 +2780,7 @@ void indent_text(void)
             log_rule_B("indent_paren_after_func_decl");
             log_rule_B("indent_paren_after_func_call");
 
-            if (  chunk_is_newline(next)
+            if (  next->IsNewline()
                && !options::indent_paren_after_func_def()
                && !options::indent_paren_after_func_decl()
                && !options::indent_paren_after_func_call())
@@ -2813,16 +2792,16 @@ void indent_text(void)
                {
                   sub = 3;
                }
-               sub = static_cast<int>(frm.size()) - sub;
+               sub = frm.size() - sub;
 
                log_rule_B("indent_align_paren");
 
                if (!options::indent_align_paren())
                {
-                  sub = static_cast<int>(frm.size()) - 2;
+                  sub = frm.size() - 2;
 
                   while (  sub > 0
-                        && are_chunks_in_same_line(frm.at(sub).pc, frm.top().pc))
+                        && frm.at(sub).pc->IsOnSameLine(frm.top().pc))
                   {
                      sub--;
                      skipped = true;
@@ -2830,7 +2809,7 @@ void indent_text(void)
 
                   if (  (  frm.at(sub + 1).type == CT_CLASS_COLON
                         || frm.at(sub + 1).type == CT_CONSTR_COLON)
-                     && (chunk_is_token(frm.at(sub + 1).pc->prev, CT_NEWLINE)))
+                     && (frm.at(sub + 1).pc->GetPrev()->Is(CT_NEWLINE)))
                   {
                      sub = sub + 1;
                   }
@@ -2846,7 +2825,7 @@ void indent_text(void)
                if (  next->IsNotNullChunk()
                   && !next->IsComment())
                {
-                  if (chunk_is_token(next, CT_SPACE))
+                  if (next->Is(CT_SPACE))
                   {
                      next = next->GetNextNc();
 
@@ -2856,14 +2835,14 @@ void indent_text(void)
                      }
                   }
 
-                  if (next->prev->IsComment())
+                  if (next->GetPrev()->IsComment())
                   {
                      // Issue #2099
-                     frm.top().indent = next->prev->column;
+                     frm.top().indent = next->GetPrev()->GetColumn();
                   }
                   else
                   {
-                     frm.top().indent = next->column;
+                     frm.top().indent = next->GetColumn();
                   }
                   log_indent();
                }
@@ -2878,18 +2857,18 @@ void indent_text(void)
                   && vardefcol == 0)
                || (  !options::use_indent_continue_only_once()  // Issue #1160
                   && !options::indent_ignore_first_continue())) // Issue #3561
-            && (  chunk_is_token(pc, CT_FPAREN_OPEN)
-               && chunk_is_newline(pc->GetPrev()))
-            && (  (  (  get_chunk_parent_type(pc) == CT_FUNC_PROTO
-                     || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO)
+            && (  pc->Is(CT_FPAREN_OPEN)
+               && pc->GetPrev()->IsNewline())
+            && (  (  (  pc->GetParentType() == CT_FUNC_PROTO
+                     || pc->GetParentType() == CT_FUNC_CLASS_PROTO)
                   && options::indent_paren_after_func_decl())
-               || (  (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-                     || get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF)
+               || (  (  pc->GetParentType() == CT_FUNC_DEF
+                     || pc->GetParentType() == CT_FUNC_CLASS_DEF)
                   && options::indent_paren_after_func_def())
-               || (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-                     || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
+               || (  (  pc->GetParentType() == CT_FUNC_CALL
+                     || pc->GetParentType() == CT_FUNC_CALL_USER)
                   && options::indent_paren_after_func_call())
-               || !chunk_is_newline(pc->GetNext())))
+               || !pc->GetNext()->IsNewline()))
          {
             frm.top().indent = frm.prev().indent + indent_size;
             log_indent();
@@ -2898,7 +2877,7 @@ void indent_text(void)
          }
          log_rule_B("indent_continue");
 
-         if (  get_chunk_parent_type(pc) != CT_OC_AT
+         if (  pc->GetParentType() != CT_OC_AT
             && (  options::indent_ignore_first_continue()
                || options::indent_continue() != 0)
             && !skipped)
@@ -2913,13 +2892,13 @@ void indent_text(void)
             }
             log_indent();
 
-            if (  pc->level == pc->brace_level
+            if (  pc->GetLevel() == pc->GetBraceLevel()
                && !options::indent_ignore_first_continue()
-               && (  chunk_is_token(pc, CT_FPAREN_OPEN)
-                  || chunk_is_token(pc, CT_SPAREN_OPEN)
-                  || (  chunk_is_token(pc, CT_SQUARE_OPEN)
-                     && get_chunk_parent_type(pc) != CT_OC_MSG)
-                  || chunk_is_token(pc, CT_ANGLE_OPEN)))     // Issue #1170
+               && (  pc->Is(CT_FPAREN_OPEN)
+                  || pc->Is(CT_SPAREN_OPEN)
+                  || (  pc->Is(CT_SQUARE_OPEN)
+                     && pc->GetParentType() != CT_OC_MSG)
+                  || pc->Is(CT_ANGLE_OPEN)))     // Issue #1170
             {
                //log_rule_B("indent_continue");
                //frm.top().indent += abs(options::indent_continue());
@@ -2958,7 +2937,7 @@ void indent_text(void)
 
                   log_rule_B("indent_sparen_extra");
 
-                  if (  chunk_is_token(pc, CT_SPAREN_OPEN)
+                  if (  pc->Is(CT_SPAREN_OPEN)
                      && options::indent_sparen_extra() != 0)
                   {
                      frm.top().indent += options::indent_sparen_extra();
@@ -2973,7 +2952,7 @@ void indent_text(void)
          frm.paren_count++;
       }
       else if (  options::indent_member_single()
-              && chunk_is_token(pc, CT_MEMBER)
+              && pc->Is(CT_MEMBER)
               && (strcmp(pc->Text(), ".") == 0)
               && language_is_set(LANG_CS | LANG_CPP))
       {
@@ -2984,7 +2963,7 @@ void indent_text(void)
             frm.push(pc, __func__, __LINE__);
             Chunk *tmp = frm.top().pc->GetPrevNcNnlNpp();
 
-            if (are_chunks_in_same_line(frm.prev().pc, tmp))
+            if (frm.prev().pc->IsOnSameLine(tmp))
             {
                frm.top().indent = frm.prev().indent;
             }
@@ -2997,9 +2976,9 @@ void indent_text(void)
             log_indent_tmp();
          }
 
-         if (chunk_is_newline(pc->GetPrev()))
+         if (pc->GetPrev()->IsNewline())
          {
-            if (  chunk_is_token(pc, CT_MEMBER)                           // Issue #2890
+            if (  pc->Is(CT_MEMBER)                           // Issue #2890
                && language_is_set(LANG_CPP))
             {
                // will be done at another place
@@ -3017,13 +2996,13 @@ void indent_text(void)
 
          if (tmp->IsNotNullChunk())
          {
-            if (chunk_is_token(tmp, CT_FUNC_CALL))
+            if (tmp->Is(CT_FUNC_CALL))
             {
-               tmp = tmp->GetNextType(CT_FPAREN_CLOSE, tmp->level);
+               tmp = tmp->GetNextType(CT_FPAREN_CLOSE, tmp->GetLevel());
                tmp = tmp->GetNextNcNnlNpp();
             }
-            else if (  chunk_is_token(tmp, CT_WORD)
-                    || chunk_is_token(tmp, CT_TYPE))
+            else if (  tmp->Is(CT_WORD)
+                    || tmp->Is(CT_TYPE))
             {
                tmp = tmp->GetNextNcNnlNpp();
             }
@@ -3031,9 +3010,9 @@ void indent_text(void)
 
          if (  tmp->IsNotNullChunk()
             && (  (strcmp(tmp->Text(), ".") != 0)
-               || tmp->type != CT_MEMBER))
+               || tmp->IsNot(CT_MEMBER)))
          {
-            if (chunk_is_paren_close(tmp))
+            if (tmp->IsParenClose())
             {
                tmp = tmp->GetPrevNcNnlNpp();
             }
@@ -3045,7 +3024,7 @@ void indent_text(void)
             }
 
             if (  tmp->IsNotNullChunk()
-               && chunk_is_newline(tmp->GetPrev()))
+               && tmp->GetPrev()->IsNewline())
             {
                tmp = tmp->GetPrevNcNnlNpp()->GetNextNl();
             }
@@ -3056,9 +3035,9 @@ void indent_text(void)
             }
          }
       }
-      else if (  chunk_is_token(pc, CT_ASSIGN)
-              || chunk_is_token(pc, CT_IMPORT)
-              || (  chunk_is_token(pc, CT_USING)
+      else if (  pc->Is(CT_ASSIGN)
+              || pc->Is(CT_IMPORT)
+              || (  pc->Is(CT_USING)
                  && language_is_set(LANG_CS)))
       {
          /*
@@ -3066,8 +3045,8 @@ void indent_text(void)
           * just indent one level,
           * otherwise align on the '='.
           */
-         if (  chunk_is_token(pc, CT_ASSIGN)
-            && chunk_is_newline(pc->GetPrev()))
+         if (  pc->Is(CT_ASSIGN)
+            && pc->GetPrev()->IsNewline())
          {
             if (frm.top().type == CT_ASSIGN_NL)
             {
@@ -3081,7 +3060,7 @@ void indent_text(void)
 
             indent_column_set(frm.top().indent_tmp);
             LOG_FMT(LINDENT, "%s(%d): %zu] assign => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, frm.top().indent_tmp);
          }
          Chunk *next = pc->GetNext();
@@ -3092,19 +3071,19 @@ void indent_text(void)
              * fixes  1260 , 1268 , 1277 (Extra indentation after line with multiple assignments)
              * For multiple consecutive assignments in single line , the indent of all these
              * assignments should be same and one more than this line's indent.
-             * so poping the previous assign and pushing the new one
+             * so popping the previous assign and pushing the new one
              */
             if (  frm.top().type == CT_ASSIGN
-               && chunk_is_token(pc, 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",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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);
             }
             frm.push(pc, __func__, __LINE__);
 
-            if (  chunk_is_token(pc, CT_ASSIGN)
-               && chunk_is_newline(pc->GetPrev()))
+            if (  pc->Is(CT_ASSIGN)
+               && pc->GetPrev()->IsNewline())
             {
                frm.top().type = CT_ASSIGN_NL;
             }
@@ -3121,10 +3100,10 @@ void indent_text(void)
                frm.top().indent = frm.prev().indent;
                log_indent();
 
-               if (  pc->level == pc->brace_level
-                  && (  pc->type != CT_ASSIGN
-                     || (  get_chunk_parent_type(pc) != CT_FUNC_PROTO
-                        && get_chunk_parent_type(pc) != CT_FUNC_DEF)))
+               if (  pc->GetLevel() == pc->GetBraceLevel()
+                  && (  pc->IsNot(CT_ASSIGN)
+                     || (  pc->GetParentType() != CT_FUNC_PROTO
+                        && pc->GetParentType() != CT_FUNC_DEF)))
                {
                   log_rule_B("use_indent_continue_only_once");
 
@@ -3146,7 +3125,7 @@ void indent_text(void)
                   }
                }
             }
-            else if (  chunk_is_newline(next)
+            else if (  next->IsNewline()
                     || !options::indent_align_assign())
             {
                log_rule_B("indent_align_assign");
@@ -3162,8 +3141,8 @@ void indent_text(void)
                }
                log_indent();
 
-               if (  chunk_is_token(pc, CT_ASSIGN)
-                  && chunk_is_newline(next))
+               if (  pc->Is(CT_ASSIGN)
+                  && next->IsNewline())
                {
                   frm.top().type       = CT_ASSIGN_NL;
                   frm.top().indent_tab = frm.top().indent;
@@ -3171,20 +3150,20 @@ void indent_text(void)
             }
             else
             {
-               frm.top().indent = pc->column + pc->Len() + 1;
+               frm.top().indent = pc->GetColumn() + pc->Len() + 1;
                log_indent();
             }
             frm.top().indent_tmp = frm.top().indent;
             log_indent_tmp();
          }
       }
-      else if (  chunk_is_token(pc, CT_RETURN)
-              || (  chunk_is_token(pc, CT_THROW)
-                 && get_chunk_parent_type(pc) == CT_NONE))
+      else if (  pc->Is(CT_RETURN)
+              || (  pc->Is(CT_THROW)
+                 && pc->GetParentType() == CT_NONE))
       {
          // don't count returns inside a () or []
-         if (  pc->level == pc->brace_level
-            || pc->flags.test(PCF_IN_LAMBDA))
+         if (  pc->GetLevel() == pc->GetBraceLevel()
+            || pc->TestFlags(PCF_IN_LAMBDA))
          {
             Chunk *next = pc->GetNext();
 
@@ -3195,7 +3174,7 @@ void indent_text(void)
             // to properly indent object initializers returned by functions.
             log_rule_B("indent_off_after_return_new");
             bool indent_after_return = (  next->IsNotNullChunk()
-                                       && next->type == CT_NEW)
+                                       && next->GetType() == CT_NEW)
                                        ? !options::indent_off_after_return_new()
                                        : !options::indent_off_after_return();
 
@@ -3206,8 +3185,8 @@ void indent_text(void)
 
                log_rule_B("indent_single_after_return");
 
-               if (  chunk_is_newline(next)
-                  || (  chunk_is_token(pc, CT_RETURN)
+               if (  next->IsNewline()
+                  || (  pc->Is(CT_RETURN)
                      && options::indent_single_after_return()))
                {
                   // apply normal single indentation
@@ -3225,8 +3204,8 @@ void indent_text(void)
             log_indent();
          }
       }
-      else if (  chunk_is_token(pc, CT_OC_SCOPE)
-              || chunk_is_token(pc, CT_TYPEDEF))
+      else if (  pc->Is(CT_OC_SCOPE)
+              || pc->Is(CT_TYPEDEF))
       {
          frm.push(pc, __func__, __LINE__);
          // Issue #405
@@ -3257,30 +3236,30 @@ void indent_text(void)
             log_indent();
          }
       }
-      else if (chunk_is_token(pc, CT_C99_MEMBER))
+      else if (pc->Is(CT_C99_MEMBER))
       {
          // nothing to do
       }
-      else if (chunk_is_token(pc, CT_WHERE_SPEC))
+      else if (pc->Is(CT_WHERE_SPEC))
       {
          /* class indentation is ok already, just need to adjust func */
          /* TODO: make this configurable, obviously.. */
-         if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-            || get_chunk_parent_type(pc) == CT_FUNC_PROTO
-            || (  get_chunk_parent_type(pc) == CT_STRUCT
+         if (  pc->GetParentType() == CT_FUNC_DEF
+            || pc->GetParentType() == CT_FUNC_PROTO
+            || (  pc->GetParentType() == CT_STRUCT
                && frm.top().type != CT_CLASS_COLON))
          {
             indent_column_set(frm.top().indent + 4);
          }
       }
       else if (  options::indent_inside_ternary_operator()
-              && (  chunk_is_token(pc, CT_QUESTION)
-                 || chunk_is_token(pc, CT_COND_COLON))) // Issue #1130, #1715
+              && (  pc->Is(CT_QUESTION)
+                 || pc->Is(CT_COND_COLON))) // Issue #1130, #1715
       {
          log_rule_B("indent_inside_ternary_operator");
 
          // Pop any colons before because they should already be processed
-         while (  chunk_is_token(pc, CT_COND_COLON)
+         while (  pc->Is(CT_COND_COLON)
                && frm.top().type == CT_COND_COLON)
          {
             frm.pop(__func__, __LINE__, pc);
@@ -3289,11 +3268,11 @@ void indent_text(void)
 
          // Pop Question from stack in ternary operator
          if (  options::indent_inside_ternary_operator()
-            && chunk_is_token(pc, CT_COND_COLON)
+            && pc->Is(CT_COND_COLON)
             && frm.top().type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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);
          }
@@ -3305,9 +3284,9 @@ void indent_text(void)
          frm.top().indent_tmp = frm.top().indent;
          log_indent_tmp();
       }
-      else if (  chunk_is_token(pc, CT_LAMBDA)
+      else if (  pc->Is(CT_LAMBDA)
               && (language_is_set(LANG_CS | LANG_JAVA))
-              && pc->GetNextNcNnlNpp()->type != CT_BRACE_OPEN
+              && pc->GetNextNcNnlNpp()->IsNot(CT_BRACE_OPEN)
               && options::indent_cs_delegate_body())
       {
          log_rule_B("indent_cs_delegate_body");
@@ -3315,16 +3294,16 @@ void indent_text(void)
          frm.top().indent = frm.prev().indent;
          log_indent();
 
-         if (  chunk_is_newline(pc->GetPrevNc())
-            && !are_chunks_in_same_line(frm.prev().pc, pc->GetPrevNcNnl()))
+         if (  pc->GetPrevNc()->IsNewline()
+            && !frm.prev().pc->IsOnSameLine(pc->GetPrevNcNnl()))
          {
             frm.top().indent = frm.prev().indent + indent_size;
             log_indent();
             reindent_line(pc, (frm.prev().indent + indent_size));
             did_newline = false;
          }
-         else if (  chunk_is_newline(pc->GetNextNc())
-                 && !are_chunks_in_same_line(frm.prev().pc, frm.top().pc))
+         else if (  pc->GetNextNc()->IsNewline()
+                 && !frm.prev().pc->IsOnSameLine(frm.top().pc))
          {
             frm.top().indent = frm.prev().indent + indent_size;
          }
@@ -3333,9 +3312,9 @@ void indent_text(void)
          log_indent_tmp();
       }
       else if (  options::indent_oc_inside_msg_sel()
-              && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
-                 || chunk_is_token(pc, CT_OC_MSG_NAME))
-              && chunk_is_token(pc->GetNextNcNnl(), CT_OC_COLON)) // Issue #2658
+              && (  pc->Is(CT_OC_MSG_FUNC)
+                 || pc->Is(CT_OC_MSG_NAME))
+              && pc->GetNextNcNnl()->Is(CT_OC_COLON)) // Issue #2658
       {
          log_rule_B("indent_oc_inside_msg_sel");
          // Pop the OC msg name that is on the top of the stack
@@ -3353,10 +3332,10 @@ void indent_text(void)
          // Issue #3294
          Chunk *next = pc->GetNext();
 
-         if (chunk_is_token(next, CT_COND_COLON))
+         if (next->Is(CT_COND_COLON))
          {
-            LOG_FMT(LINDLINE, "%s(%d): Comment and COND_COLON: pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            LOG_FMT(LINDLINE, "%s(%d): Comment and COND_COLON: 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);
          }
 // uncomment the line below to get debug info
@@ -3366,8 +3345,8 @@ void indent_text(void)
          {
             // anything else?
             // Issue #3294
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            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()));
             LOG_FMT(LSPACE, "\n\n%s(%d): WARNING: unrecognize indent_text:\n",
                     __func__, __LINE__);
          }
@@ -3377,8 +3356,8 @@ void indent_text(void)
       {
          // anything else?
 #ifdef ANYTHING_ELSE
-         LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         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()));
          LOG_FMT(LSPACE, "\n\n%s(%d): WARNING: unrecognize indent_text:\n",
                  __func__, __LINE__);
 #endif /* ANYTHING_ELSE */
@@ -3389,13 +3368,11 @@ void indent_text(void)
       log_rule_B("indent_shift");
 
       if (  options::indent_shift() == 1
-         && !pc->flags.test(PCF_IN_ENUM)
-         && get_chunk_parent_type(pc) != CT_OPERATOR
-         && pc->type != CT_COMMENT
-         && pc->type != CT_COMMENT_CPP
-         && pc->type != CT_COMMENT_MULTI
-         && pc->type != CT_BRACE_OPEN
-         && pc->level > 0
+         && !pc->TestFlags(PCF_IN_ENUM)
+         && pc->GetParentType() != CT_OPERATOR
+         && !pc->IsComment()
+         && pc->IsNot(CT_BRACE_OPEN)
+         && pc->GetLevel() > 0
          && !pc->IsEmptyText())
       {
          bool in_shift    = false;
@@ -3406,7 +3383,7 @@ void indent_text(void)
 
          do
          {
-            if (chunk_is_token(tmp, CT_SHIFT))
+            if (tmp->Is(CT_SHIFT))
             {
                in_shift = true;
                LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
@@ -3414,7 +3391,7 @@ void indent_text(void)
 
                tmp = tmp->GetPrevNcNnl();
 
-               if (chunk_is_token(tmp, CT_OPERATOR))
+               if (tmp->Is(CT_OPERATOR))
                {
                   is_operator = true;
                }
@@ -3423,12 +3400,12 @@ void indent_text(void)
             tmp = tmp->GetPrevNcNnl();
          } while (  !in_shift
                  && tmp->IsNotNullChunk()
-                 && tmp->type != CT_SEMICOLON
-                 && tmp->type != CT_BRACE_OPEN
-                 && tmp->type != CT_BRACE_CLOSE
-                 && tmp->type != CT_COMMA
-                 && tmp->type != CT_SPAREN_OPEN
-                 && tmp->type != CT_SPAREN_CLOSE);
+                 && tmp->IsNot(CT_SEMICOLON)
+                 && tmp->IsNot(CT_BRACE_OPEN)
+                 && tmp->IsNot(CT_BRACE_CLOSE)
+                 && tmp->IsNot(CT_COMMA)
+                 && tmp->IsNot(CT_SPAREN_OPEN)
+                 && tmp->IsNot(CT_SPAREN_CLOSE));
 
          tmp = pc;
 
@@ -3437,7 +3414,7 @@ void indent_text(void)
             tmp = tmp->GetNextNcNnl();
 
             if (  tmp->IsNotNullChunk()
-               && chunk_is_token(tmp, CT_SHIFT))
+               && tmp->Is(CT_SHIFT))
             {
                in_shift = true;
                LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
@@ -3445,7 +3422,7 @@ void indent_text(void)
 
                tmp = tmp->GetPrevNcNnl();
 
-               if (chunk_is_token(tmp, CT_OPERATOR))
+               if (tmp->Is(CT_OPERATOR))
                {
                   is_operator = true;
                }
@@ -3453,27 +3430,25 @@ void indent_text(void)
             }
          } while (  !in_shift
                  && tmp->IsNotNullChunk()
-                 && tmp->type != CT_SEMICOLON
-                 && tmp->type != CT_BRACE_OPEN
-                 && tmp->type != CT_BRACE_CLOSE
-                 && tmp->type != CT_COMMA
-                 && tmp->type != CT_SPAREN_OPEN
-                 && tmp->type != CT_SPAREN_CLOSE);
+                 && tmp->IsNot(CT_SEMICOLON)
+                 && tmp->IsNot(CT_BRACE_OPEN)
+                 && tmp->IsNot(CT_BRACE_CLOSE)
+                 && tmp->IsNot(CT_COMMA)
+                 && tmp->IsNot(CT_SPAREN_OPEN)
+                 && tmp->IsNot(CT_SPAREN_CLOSE));
 
          LOG_FMT(LINDENT2, "%s(%d): in_shift is %s\n",
                  __func__, __LINE__, in_shift ? "TRUE" : "FALSE");
          Chunk *prev_nonl = pc->GetPrevNcNnl();
          Chunk *prev2     = pc->GetPrevNc();
 
-         if ((  chunk_is_semicolon(prev_nonl)
-             || chunk_is_token(prev_nonl, CT_BRACE_OPEN)
-             || chunk_is_token(prev_nonl, CT_BRACE_CLOSE)
-             || chunk_is_token(prev_nonl, CT_VBRACE_CLOSE)
-             || chunk_is_token(prev_nonl, CT_VBRACE_OPEN)
-             || chunk_is_token(prev_nonl, CT_CASE_COLON)
+         if ((  prev_nonl->IsSemicolon()
+             || prev_nonl->IsBraceOpen()
+             || prev_nonl->IsBraceClose()
+             || prev_nonl->Is(CT_CASE_COLON)
              || (  prev_nonl->IsNotNullChunk()
-                && prev_nonl->flags.test(PCF_IN_PREPROC)) != pc->flags.test(PCF_IN_PREPROC)
-             || chunk_is_token(prev_nonl, CT_COMMA)
+                && prev_nonl->TestFlags(PCF_IN_PREPROC)) != pc->TestFlags(PCF_IN_PREPROC)
+             || prev_nonl->Is(CT_COMMA)
              || is_operator))
          {
             in_shift = false;
@@ -3481,12 +3456,12 @@ void indent_text(void)
          LOG_FMT(LINDENT2, "%s(%d): in_shift is %s\n",
                  __func__, __LINE__, in_shift ? "TRUE" : "FALSE");
 
-         if (  chunk_is_token(prev2, CT_NEWLINE)
+         if (  prev2->Is(CT_NEWLINE)
             && in_shift)
          {
             shiftcontcol = calc_indent_continue(frm);
             // Setting frm.top().indent_cont = true in the top context when the indent is not also set
-            // just leads to compications when succeeding statements try to indent based on being
+            // 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
             // should only be set if frm.top().indent is also set.
 
@@ -3514,10 +3489,10 @@ void indent_text(void)
 
       // Handle variable definition continuation indenting
       if (  vardefcol == 0
-         && (  chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, CT_FUNC_CTOR_VAR))
-         && !pc->flags.test(PCF_IN_FCN_DEF)
-         && pc->flags.test(PCF_VAR_1ST_DEF))
+         && (  pc->Is(CT_WORD)
+            || pc->Is(CT_FUNC_CTOR_VAR))
+         && !pc->TestFlags(PCF_IN_FCN_DEF)
+         && pc->TestFlags(PCF_VAR_1ST_DEF))
       {
          log_rule_B("indent_continue");
 
@@ -3529,12 +3504,12 @@ void indent_text(void)
          {
             vardefcol = calc_indent_continue(frm);
             // Setting frm.top().indent_cont = true in the top context when the indent is not also set
-            // just leads to compications when succeeding statements try to indent based on being
+            // 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
             // should only be set if frm.top().indent is also set.
          }
          else if (  options::indent_var_def_cont()
-                 || chunk_is_newline(pc->GetPrev()))
+                 || pc->GetPrev()->IsNewline())
          {
             log_rule_B("indent_var_def_cont");
             vardefcol = frm.top().indent + indent_size;
@@ -3542,55 +3517,55 @@ void indent_text(void)
          else
          {
             // Issue #3010
-            vardefcol = pc->column;
+            vardefcol = pc->GetColumn();
             // BUT, we need to skip backward over any '*'
             Chunk *tmp = pc->GetPrevNc();
 
-            while (chunk_is_token(tmp, CT_PTR_TYPE))
+            while (tmp->Is(CT_PTR_TYPE))
             {
-               vardefcol = tmp->column;
+               vardefcol = tmp->GetColumn();
                tmp       = tmp->GetPrevNc();
             }
             // BUT, we need to skip backward over any '::' or TYPE
             //tmp = pc->GetPrevNc();
 
-            //if (chunk_is_token(tmp, CT_DC_MEMBER))
+            //if (tmp->Is(CT_DC_MEMBER))
             //{
             //   // look for a type
             //   Chunk *tmp2 = tmp->GetPrevNc();
-            //   if (chunk_is_token(tmp2, CT_TYPE))
+            //   if (tmp2->Is(CT_TYPE))
             //   {
             //      // we have something like "SomeLongNamespaceName::Foo()"
-            //      vardefcol = tmp2->column;
-            //      LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, vardefcol is %zu\n",
-            //              __func__, __LINE__, pc->orig_line, vardefcol);
+            //      vardefcol = tmp2->GetColumn();
+            //      LOG_FMT(LINDENT, "%s(%d): orig line is %zu, vardefcol is %zu\n",
+            //              __func__, __LINE__, pc->GetOrigLine(), vardefcol);
             //   }
             //}
          }
       }
 
-      if (  chunk_is_semicolon(pc)
-         || (  chunk_is_token(pc, CT_BRACE_OPEN)
-            && (  get_chunk_parent_type(pc) == CT_FUNCTION
-               || get_chunk_parent_type(pc) == CT_CLASS))) //Issue #3576
+      if (  pc->IsSemicolon()
+         || (  pc->Is(CT_BRACE_OPEN)
+            && (  pc->GetParentType() == CT_FUNCTION
+               || pc->GetParentType() == CT_CLASS))) //Issue #3576
       {
          vardefcol = 0;
       }
 
       // Indent the line if needed
       if (  did_newline
-         && !chunk_is_newline(pc)
+         && !pc->IsNewline()
          && (pc->Len() != 0))
       {
-         pc->column_indent = frm.top().indent_tab;
+         pc->SetColumnIndent(frm.top().indent_tab);
 
          if (frm.top().ip.ref)
          {
-            pc->indent.ref   = frm.top().ip.ref;
-            pc->indent.delta = frm.top().ip.delta;
+            pc->IndentData().ref   = frm.top().ip.ref;
+            pc->IndentData().delta = frm.top().ip.delta;
          }
-         LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->column_indent is %zu, indent_column is %zu, for '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->column_indent, indent_column, pc->ElidedText(copy));
+         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));
 
          /*
           * Check for special continuations.
@@ -3598,115 +3573,115 @@ void indent_text(void)
           * everything else
           */
 
-         auto prev  = pc->GetPrevNcNnl();
-         auto prevv = prev->GetPrevNcNnl();
-         auto next  = pc->GetNextNcNnl();
+         Chunk *prev  = pc->GetPrevNcNnl();
+         Chunk *prevv = prev->GetPrevNcNnl();
+         Chunk *next  = pc->GetNextNcNnl();
 
-         bool do_vardefcol = false;
+         bool  do_vardefcol = false;
 
          if (  vardefcol > 0
-            && pc->level == pc->brace_level
-            && (  chunk_is_token(prev, CT_COMMA)
-               || chunk_is_token(prev, CT_TYPE)
-               || chunk_is_token(prev, CT_PTR_TYPE)
-               || chunk_is_token(prev, CT_WORD)))
+            && pc->GetLevel() == pc->GetBraceLevel()
+            && (  prev->Is(CT_COMMA)
+               || prev->Is(CT_TYPE)
+               || prev->Is(CT_PTR_TYPE)
+               || prev->Is(CT_WORD)))
          {
             Chunk *tmp = pc;
 
-            while (chunk_is_token(tmp, CT_PTR_TYPE))
+            while (tmp->Is(CT_PTR_TYPE))
             {
                tmp = tmp->GetNextNcNnl();
             }
-            LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, for '%s'",
-                    __func__, __LINE__, tmp->orig_line, tmp->Text());
-            LOG_FMT(LINDENT2, " tmp->flags: ");
-            log_pcf_flags(LINDENT2, tmp->flags);                   // Issue #2332
+            LOG_FMT(LINDENT2, "%s(%d): orig line is %zu, for '%s'",
+                    __func__, __LINE__, tmp->GetOrigLine(), tmp->Text());
+            LOG_FMT(LINDENT2, " tmp->GetFlags(): ");
+            log_pcf_flags(LINDENT2, tmp->GetFlags());                   // Issue #2332
 
-            if (  tmp->flags.test(PCF_VAR_DEF)
-               && (  chunk_is_token(tmp, CT_WORD)
-                  || chunk_is_token(tmp, CT_FUNC_CTOR_VAR)))
+            if (  tmp->TestFlags(PCF_VAR_DEF)
+               && (  tmp->Is(CT_WORD)
+                  || tmp->Is(CT_FUNC_CTOR_VAR)))
             {
                do_vardefcol = true;
             }
          }
          //LOG_FMT(LINDENT2, "%s(%d): GUY 2:\n", __func__, __LINE__);
 
-         if (pc->flags.test(PCF_DONT_INDENT))
+         if (pc->TestFlags(PCF_DONT_INDENT))
          {
             // no change
          }
-         else if (  get_chunk_parent_type(pc) == CT_SQL_EXEC
+         else if (  pc->GetParentType() == CT_SQL_EXEC
                  && options::indent_preserve_sql())
          {
             log_rule_B("indent_preserve_sql");
-            reindent_line(pc, sql_col + (pc->orig_col - sql_orig_col));
+            reindent_line(pc, sql_col + (pc->GetOrigCol() - sql_orig_col));
             LOG_FMT(LINDENT, "Indent SQL: [%s] to %zu (%zu/%zu)\n",
-                    pc->Text(), pc->column, sql_col, sql_orig_col);
+                    pc->Text(), pc->GetColumn(), sql_col, sql_orig_col);
          }
          else if (  !options::indent_member_single()
-                 && !pc->flags.test(PCF_STMT_START)
-                 && (  chunk_is_token(pc, CT_MEMBER)
-                    || (  chunk_is_token(pc, CT_DC_MEMBER)
-                       && chunk_is_token(prev, CT_TYPE))
-                    || (  chunk_is_token(prev, CT_MEMBER)
-                       || (  chunk_is_token(prev, CT_DC_MEMBER)
-                          && chunk_is_token(prevv, CT_TYPE)))))
+                 && !pc->TestFlags(PCF_STMT_START)
+                 && (  pc->Is(CT_MEMBER)
+                    || (  pc->Is(CT_DC_MEMBER)
+                       && prev->Is(CT_TYPE))
+                    || (  prev->Is(CT_MEMBER)
+                       || (  prev->Is(CT_DC_MEMBER)
+                          && prevv->Is(CT_TYPE)))))
          {
             log_rule_B("indent_member_single");
             log_rule_B("indent_member");
             size_t tmp = options::indent_member() + indent_column;
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, member => %zu\n",
-                    __func__, __LINE__, pc->orig_line, tmp);
+            LOG_FMT(LINDENT, "%s(%d): orig line is %zu, member => %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), tmp);
             reindent_line(pc, tmp);
          }
          else if (do_vardefcol)
          {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, vardefcol is %zu\n",
-                    __func__, __LINE__, pc->orig_line, vardefcol);
+            LOG_FMT(LINDENT, "%s(%d): orig line is %zu, vardefcol is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), vardefcol);
             reindent_line(pc, vardefcol);
          }
          else if (shiftcontcol > 0)
          {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, shiftcontcol is %zu\n",
-                    __func__, __LINE__, pc->orig_line, shiftcontcol);
+            LOG_FMT(LINDENT, "%s(%d): orig line is %zu, shiftcontcol is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), shiftcontcol);
             reindent_line(pc, shiftcontcol);
          }
-         else if (  chunk_is_token(pc, CT_NAMESPACE)
+         else if (  pc->Is(CT_NAMESPACE)
                  && options::indent_namespace()
                  && options::indent_namespace_single_indent()
                  && frm.top().ns_cnt)
          {
             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->orig_line, frm.top().brace_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);
          }
-         else if (  chunk_is_token(pc, CT_STRING)
-                 && chunk_is_token(prev, CT_STRING)
+         else if (  pc->Is(CT_STRING)
+                 && prev->Is(CT_STRING)
                  && options::indent_align_string())
          {
             log_rule_B("indent_align_string");
-            const int tmp = (xml_indent != 0) ? xml_indent : prev->column;
+            const int tmp = (xml_indent != 0) ? xml_indent : prev->GetColumn();
 
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, String => %d\n",
-                    __func__, __LINE__, pc->orig_line, tmp);
+            LOG_FMT(LINDENT, "%s(%d): orig line is %zu, String => %d\n",
+                    __func__, __LINE__, pc->GetOrigLine(), tmp);
             reindent_line(pc, tmp);
          }
          else if (pc->IsComment())
          {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, comment => %zu\n",
-                    __func__, __LINE__, pc->orig_line, frm.top().indent_tmp);
+            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);
          }
-         else if (chunk_is_token(pc, CT_PREPROC))
+         else if (pc->Is(CT_PREPROC))
          {
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, pp-indent => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+            LOG_FMT(LINDENT, "%s(%d): orig line is %zu, pp-indent => %zu [%s]\n",
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         else if (  chunk_is_paren_close(pc)
-                 || chunk_is_token(pc, CT_ANGLE_CLOSE))
+         else if (  pc->IsParenClose()
+                 || pc->Is(CT_ANGLE_CLOSE))
          {
             /*
              * This is a big hack. We assume that since we hit a paren close,
@@ -3715,29 +3690,29 @@ void indent_text(void)
             LOG_FMT(LINDLINE, "%s(%d): indent_column is %zu\n",
                     __func__, __LINE__, indent_column);
 
-            if (frm.poped().type == E_Token(pc->type - 1))
+            if (frm.poped().type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+               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;
-               LOG_FMT(LINDLINE, "%s(%d): ck1->orig_line is %zu, ck1->orig_col is %zu, ck1->Text() is '%s', ck1->type is %s\n",
-                       __func__, __LINE__, ck1->orig_line, ck1->orig_col, ck1->Text(), get_token_name(ck1->type));
+               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();
-               LOG_FMT(LINDLINE, "%s(%d): ck2->orig_line is %zu, ck2->orig_col is %zu, ck2->Text() is '%s', ck2->type is %s\n",
-                       __func__, __LINE__, ck2->orig_line, ck2->orig_col, ck2->Text(), get_token_name(ck2->type));
+               LOG_FMT(LINDLINE, "%s(%d): ck2 orig line is %zu, orig col is %zu, Text() is '%s', GetType() is %s\n",
+                       __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol(), ck2->Text(), get_token_name(ck2->GetType()));
 
                log_rule_B("indent_paren_close");
 
                if (options::indent_paren_close() == -1)
                {
                   LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_paren_close is -1\n",
-                          __func__, __LINE__, ck2->orig_line, ck2->orig_col);
-                  indent_column_set(pc->orig_col);
+                          __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol());
+                  indent_column_set(pc->GetOrigCol());
                   LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
-                          __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
+                          __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol(), indent_column);
                }
-               else if (  chunk_is_newline(ck2)
+               else if (  ck2->IsNewline()
                        || (options::indent_paren_close() == 1))
                {
                   /*
@@ -3746,10 +3721,10 @@ void indent_text(void)
                    * column
                    */
                   LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_paren_close is 1\n",
-                          __func__, __LINE__, ck2->orig_line, ck2->orig_col);
-                  indent_column_set(ck1->column);
+                          __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol());
+                  indent_column_set(ck1->GetColumn());
                   LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
-                          __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
+                          __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol(), indent_column);
                }
                else
                {
@@ -3757,28 +3732,28 @@ void indent_text(void)
                   {
                      // 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->orig_line, ck2->orig_col);
+                             __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol());
                      indent_column_set(frm.poped().indent_tmp);
                      LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
-                             __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
-                     pc->column_indent = frm.poped().indent_tab;
+                             __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol(), indent_column);
+                     pc->SetColumnIndent(frm.poped().indent_tab);
                      log_rule_B("indent_paren_close");
 
                      if (options::indent_paren_close() == 1)
                      {
                         LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_paren_close is 1\n",
-                                __func__, __LINE__, ck2->orig_line, ck2->orig_col);
+                                __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol());
 
                         if (indent_column == 0)
                         {
                            fprintf(stderr, "%s(%d): indent_column is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                                   __func__, __LINE__, pc->orig_line, pc->orig_col);
+                                   __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                            log_flush(true);
                            exit(EX_SOFTWARE);
                         }
                         indent_column--;
                         LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
-                                __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
+                                __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol(), indent_column);
                      }
                   }
                   else
@@ -3786,44 +3761,44 @@ void indent_text(void)
                      // indent_paren_close is 2: Indent to the brace level
                      LOG_FMT(LINDLINE, "%s(%d): indent_paren_close is 2\n",
                              __func__, __LINE__);
-                     LOG_FMT(LINDLINE, "%s(%d): ck2->orig_line is %zu, ck2->orig_col is %zu, ck2->Text() is '%s'\n",
-                             __func__, __LINE__, ck2->orig_line, ck2->orig_col, ck2->Text());
+                     LOG_FMT(LINDLINE, "%s(%d): ck2 orig line is %zu, orig col is %zu, ck2->Text() is '%s'\n",
+                             __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol(), ck2->Text());
 
-                     if (pc->GetPrev()->type == CT_NEWLINE)
+                     if (pc->GetPrev()->GetType() == CT_NEWLINE)
                      {
-                        LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+                        LOG_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()));
                         LOG_FMT(LINDLINE, "%s(%d): prev is <newline>\n",
                                 __func__, __LINE__);
                         Chunk *search = pc;
 
-                        while (chunk_is_paren_close(search->GetNext()))
+                        while (search->GetNext()->IsParenClose())
                         {
                            search = search->GetNext();
                         }
                         Chunk *searchNext = search->GetNext();
 
                         // Issue #3407 - Skip over a possible 'noexcept' keyword before going forward.
-                        if (searchNext->type == CT_NOEXCEPT)
+                        if (searchNext->GetType() == CT_NOEXCEPT)
                         {
                            searchNext = searchNext->GetNext();
                         }
 
-                        if (  searchNext->type == CT_SEMICOLON
-                           || searchNext->type == CT_MEMBER            // Issue #2582
-                           || searchNext->type == CT_NEWLINE)
+                        if (  searchNext->GetType() == CT_SEMICOLON
+                           || searchNext->GetType() == CT_MEMBER            // Issue #2582
+                           || searchNext->GetType() == CT_NEWLINE)
                         {
                            LOG_FMT(LINDLINE, "%s(%d):\n", __func__, __LINE__);
-                           search = chunk_skip_to_match_rev(search);
+                           search = search->GetOpeningParen();
 
                            if (  options::indent_oc_inside_msg_sel()
-                              && chunk_is_token(search->GetPrevNcNnl(), CT_OC_COLON)
+                              && search->GetPrevNcNnl()->Is(CT_OC_COLON)
                               && (  frm.top().type == CT_OC_MSG_FUNC
                                  || frm.top().type == CT_OC_MSG_NAME)) // Issue #2658
                            {
                               log_rule_B("indent_oc_inside_msg_sel");
                               // [Class Message:(...)<here>
-                              indent_column_set(frm.top().pc->column);
+                              indent_column_set(frm.top().pc->GetColumn());
                            }
                            else if (  options::indent_inside_ternary_operator()
                                    && (  frm.top().type == CT_QUESTION
@@ -3840,7 +3815,7 @@ void indent_text(void)
                               {
                                  search = Chunk::GetHead();
                               }
-                              indent_column_set(search->column);
+                              indent_column_set(search->GetColumn());
                            }
                         }
                      }
@@ -3848,21 +3823,21 @@ void indent_text(void)
                }
             }
             size_t indent_value = 0;
-            LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, closing parenthesis => %zu, text is '%s'\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+            LOG_FMT(LINDENT, "%s(%d): orig line is %zu, closing parenthesis => %zu, text is '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             LOG_FMT(LINDENT, "%s(%d): [%s/%s]\n",
                     __func__, __LINE__,
-                    get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
+                    get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
             Chunk *prev2 = pc->GetPrev();                  // Issue #2930
-            LOG_FMT(LINDENT, "%s(%d): prev2 is orig_line is %zu, text is '%s'\n",
-                    __func__, __LINE__, prev2->orig_line, prev2->Text());
+            LOG_FMT(LINDENT, "%s(%d): prev2 is orig line is %zu, text is '%s'\n",
+                    __func__, __LINE__, prev2->GetOrigLine(), prev2->Text());
             Chunk *next2 = pc->GetNext();
-            LOG_FMT(LINDENT, "%s(%d): next2 is orig_line is %zu, text is '%s'\n",
-                    __func__, __LINE__, next2->orig_line, next2->Text());
+            LOG_FMT(LINDENT, "%s(%d): next2 is orig line is %zu, text is '%s'\n",
+                    __func__, __LINE__, next2->GetOrigLine(), next2->Text());
 
-            if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-               && chunk_is_newline(prev2)
-               && chunk_is_newline(next2))
+            if (  pc->GetParentType() == CT_FUNC_DEF
+               && prev2->IsNewline()
+               && next2->IsNewline())
             {
                if (options::donot_indent_func_def_close_paren())
                {
@@ -3880,72 +3855,71 @@ void indent_text(void)
             }
             reindent_line(pc, indent_value);
          }
-         else if (chunk_is_token(pc, CT_COMMA))
+         else if (pc->Is(CT_COMMA))
          {
-            bool align  = false;
-            bool ignore = false;
+            bool indent_align  = false;
+            bool indent_ignore = false;
 
-            if (chunk_is_paren_open(frm.top().pc))
+            if (frm.top().pc->IsParenOpen())
             {
                log_rule_B("indent_comma_paren");
-               align  = options::indent_comma_paren() == (int)indent_mode_e::ALIGN;
-               ignore = options::indent_comma_paren() == (int)indent_mode_e::IGNORE;
+               indent_align  = options::indent_comma_paren() == (int)indent_mode_e::ALIGN;
+               indent_ignore = options::indent_comma_paren() == (int)indent_mode_e::IGNORE;
             }
-            else if (chunk_is_opening_brace(frm.top().pc))
+            else if (frm.top().pc->IsBraceOpen())
             {
                log_rule_B("indent_comma_brace");
-               align  = options::indent_comma_brace() == (int)indent_mode_e::ALIGN;
-               ignore = options::indent_comma_brace() == (int)indent_mode_e::IGNORE;
+               indent_align  = options::indent_comma_brace() == (int)indent_mode_e::ALIGN;
+               indent_ignore = options::indent_comma_brace() == (int)indent_mode_e::IGNORE;
             }
 
-            if (ignore)
+            if (indent_ignore)
             {
-               indent_column_set(pc->orig_col);
+               indent_column_set(pc->GetOrigCol());
             }
-            else if (align)
+            else if (indent_align)
             {
-               indent_column_set(frm.top().pc->column);
+               indent_column_set(frm.top().pc->GetColumn());
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] comma => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
          else if (  options::indent_func_const()
-                 && chunk_is_token(pc, CT_QUALIFIER)
+                 && pc->Is(CT_QUALIFIER)
                  && strncasecmp(pc->Text(), "const", pc->Len()) == 0
                  && (  next == nullptr
-                    || chunk_is_token(next, CT_BRACED)
-                    || chunk_is_token(next, CT_BRACE_OPEN)
-                    || chunk_is_token(next, CT_NEWLINE)
-                    || chunk_is_token(next, CT_SEMICOLON)
-                    || chunk_is_token(next, CT_THROW)
-                    || chunk_is_token(next, CT_VBRACE_OPEN)))
+                    || next->Is(CT_BRACED)
+                    || next->IsBraceOpen()
+                    || next->Is(CT_NEWLINE)
+                    || next->Is(CT_SEMICOLON)
+                    || next->Is(CT_THROW)))
          {
             // 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());
             LOG_FMT(LINDENT, "%s(%d): %zu] const => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
          else if (  options::indent_func_throw()
-                 && chunk_is_token(pc, CT_THROW)
-                 && get_chunk_parent_type(pc) != CT_NONE)
+                 && pc->Is(CT_THROW)
+                 && pc->GetParentType() != CT_NONE)
          {
             // indent throw - void GetFoo(void)\n throw()\n { return (m_Foo); }
             log_rule_B("indent_func_throw");
             indent_column_set(options::indent_func_throw());
             LOG_FMT(LINDENT, "%s(%d): %zu] throw => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         else if (chunk_is_token(pc, CT_SEMICOLON))
+         else if (pc->Is(CT_SEMICOLON))
          {
-            if (  pc->flags.test(PCF_IN_FOR)
+            if (  pc->TestFlags(PCF_IN_FOR)
                && options::indent_semicolon_for_paren())
             {
                log_rule_B("indent_semicolon_for_paren");
-               indent_column_set(frm.top().pc->column);
+               indent_column_set(frm.top().pc->GetColumn());
 
                log_rule_B("indent_first_for_expr");
 
@@ -3955,7 +3929,7 @@ void indent_text(void)
                                 indent_column + pc->Len() + 1);
                }
                LOG_FMT(LINDENT, "%s(%d): %zu] SEMICOLON => %zu [%s]\n",
-                       __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                       __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
                reindent_line(pc, indent_column);
             }
             else
@@ -3964,26 +3938,26 @@ void indent_text(void)
 
                if (options::indent_ignore_semicolon())
                {
-                  indent_column_set(pc->orig_col);
+                  indent_column_set(pc->GetOrigCol());
                }
                LOG_FMT(LINDENT, "%s(%d): %zu] semicolon => %zu [%s]\n",
-                       __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                       __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
                reindent_line(pc, indent_column);
             }
          }
-         else if (chunk_is_token(pc, CT_BOOL))
+         else if (pc->Is(CT_BOOL))
          {
-            if (chunk_is_paren_open(frm.top().pc))
+            if (frm.top().pc->IsParenOpen())
             {
                log_rule_B("indent_bool_paren");
 
                if (options::indent_bool_paren() == (int)indent_mode_e::IGNORE)
                {
-                  indent_column_set(pc->orig_col);
+                  indent_column_set(pc->GetOrigCol());
                }
                else if (options::indent_bool_paren() == (int)indent_mode_e::ALIGN)
                {
-                  indent_column_set(frm.top().pc->column);
+                  indent_column_set(frm.top().pc->GetColumn());
 
                   log_rule_B("indent_first_bool_expr");
 
@@ -4000,61 +3974,55 @@ void indent_text(void)
 
                if (options::indent_ignore_bool())
                {
-                  indent_column_set(pc->orig_col);
+                  indent_column_set(pc->GetOrigCol());
                }
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] bool => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         else if (  chunk_is_token(pc, CT_ARITH)
-                 || chunk_is_token(pc, CT_CARET))
+         else if (  pc->Is(CT_ARITH)
+                 || pc->Is(CT_CARET))
          {
             log_rule_B("indent_ignore_arith");
 
             if (options::indent_ignore_arith())
             {
-               indent_column_set(pc->orig_col);
+               indent_column_set(pc->GetOrigCol());
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] arith => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         else if (chunk_is_token(pc, CT_SHIFT))
+         else if (pc->Is(CT_SHIFT))
          {
             log_rule_B("indent_shift");
 
             if (options::indent_shift() == -1)
             {
-               indent_column_set(pc->orig_col);
+               indent_column_set(pc->GetOrigCol());
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] shift => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         else if (chunk_is_token(pc, CT_ASSIGN))
+         else if (pc->Is(CT_ASSIGN))
          {
             log_rule_B("indent_ignore_assign");
 
             if (options::indent_ignore_assign())
             {
-               indent_column_set(pc->orig_col);
+               indent_column_set(pc->GetOrigCol());
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] assign => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
          else if (  options::indent_ternary_operator() == 1
-                 && chunk_is_token(prev, CT_COND_COLON)
-                 && (  chunk_is_token(pc, CT_ADDR)
-                    || chunk_is_token(pc, CT_WORD)
-                    || chunk_is_token(pc, CT_DEREF)
-                    || chunk_is_token(pc, CT_NUMBER)
-                    || chunk_is_token(pc, CT_STRING)
-                    || chunk_is_token(pc, CT_PAREN_OPEN)))
+                 && prev->Is(CT_COND_COLON))
          {
             log_rule_B("indent_ternary_operator");
-            Chunk *tmp = prev->GetPrevType(CT_QUESTION, -1);
+            Chunk *tmp = prev->GetPrevType(CT_QUESTION);
 
             if (tmp->IsNotNullChunk())
             {
@@ -4063,27 +4031,27 @@ void indent_text(void)
                if (tmp->IsNotNullChunk())
                {
                   LOG_FMT(LINDENT, "%s: %zu] ternarydefcol => %zu [%s]\n",
-                          __func__, pc->orig_line, tmp->column, pc->Text());
-                  reindent_line(pc, tmp->column);
+                          __func__, pc->GetOrigLine(), tmp->GetColumn(), pc->Text());
+                  reindent_line(pc, tmp->GetColumn());
                }
             }
          }
          else if (  options::indent_ternary_operator() == 2
-                 && chunk_is_token(pc, CT_COND_COLON))
+                 && pc->Is(CT_COND_COLON))
          {
             log_rule_B("indent_ternary_operator");
-            Chunk *tmp = pc->GetPrevType(CT_QUESTION, -1);
+            Chunk *tmp = pc->GetPrevType(CT_QUESTION);
 
             if (tmp->IsNotNullChunk())
             {
                LOG_FMT(LINDENT, "%s: %zu] ternarydefcol => %zu [%s]\n",
-                       __func__, pc->orig_line, tmp->column, pc->Text());
-               reindent_line(pc, tmp->column);
+                       __func__, pc->GetOrigLine(), tmp->GetColumn(), pc->Text());
+               reindent_line(pc, tmp->GetColumn());
             }
          }
          else if (  options::indent_oc_inside_msg_sel()
-                 && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
-                    || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
+                 && (  pc->Is(CT_OC_MSG_FUNC)
+                    || pc->Is(CT_OC_MSG_NAME))) // Issue #2658
          {
             log_rule_B("indent_oc_inside_msg_sel");
             reindent_line(pc, frm.top().indent);
@@ -4095,10 +4063,10 @@ void indent_text(void)
 
             if (ttidx > 0)
             {
-               LOG_FMT(LINDPC, "%s(%d): (frm.at(ttidx).pc)->parent_type is %s\n",
-                       __func__, __LINE__, get_token_name((frm.at(ttidx).pc)->parent_type));
+               LOG_FMT(LINDPC, "%s(%d): (frm.at(ttidx).pc)->GetParentType() is %s\n",
+                       __func__, __LINE__, get_token_name((frm.at(ttidx).pc)->GetParentType()));
 
-               if ((frm.at(ttidx).pc)->parent_type == CT_FUNC_CALL)
+               if ((frm.at(ttidx).pc)->GetParentType() == CT_FUNC_CALL)
                {
                   LOG_FMT(LINDPC, "FUNC_CALL OK [%d]\n", __LINE__);
 
@@ -4115,62 +4083,62 @@ void indent_text(void)
                   }
                }
             }
-            LOG_FMT(LINDENT, "%s(%d): pc->line is %zu, pc->column is %zu, pc->Text() is '%s, indent_column is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->column, pc->Text(), indent_column);
+            LOG_FMT(LINDENT, "%s(%d): pc->line is %zu, pc->GetColumn() is %zu, pc->Text() is '%s, indent_column is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetColumn(), pc->Text(), indent_column);
 
             if (  use_indent
-               && pc->type != CT_PP_IGNORE) // Leave indentation alone for PP_IGNORE tokens
+               && pc->IsNot(CT_PP_IGNORE)) // Leave indentation alone for PP_IGNORE tokens
             {
                log_rule_B("pos_conditional");
 
-               if (  (  chunk_is_token(pc, CT_QUESTION)      // Issue #2101
-                     || chunk_is_token(pc, CT_COND_COLON))   // Issue #2101
+               if (  (  pc->Is(CT_QUESTION)      // Issue #2101
+                     || pc->Is(CT_COND_COLON))   // Issue #2101
                   && options::pos_conditional() == TP_IGNORE)
                {
                   // do not indent this line
                   LOG_FMT(LINDENT, "%s(%d): %zu] don't indent this line\n",
-                          __func__, __LINE__, pc->orig_line);
+                          __func__, __LINE__, pc->GetOrigLine());
                }
-               else if (chunk_is_token(pc, CT_BREAK))
+               else if (pc->Is(CT_BREAK))
                {
                   // Issue #1692
                   log_rule_B("indent_switch_break_with_case");
 
                   // Issue #2281
                   if (  options::indent_switch_break_with_case()
-                     && get_type_of_the_parent(pc) == CT_SWITCH)
+                     && pc->GetTypeOfParent() == CT_SWITCH)
                   {
                      // look for a case before Issue #2735
-                     Chunk *whereIsCase = pc->GetPrevType(CT_CASE, pc->level);
+                     Chunk *whereIsCase = pc->GetPrevType(CT_CASE, pc->GetLevel());
 
                      if (whereIsCase->IsNotNullChunk())
                      {
-                        LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                                __func__, __LINE__, whereIsCase->orig_line, whereIsCase->orig_col, whereIsCase->Text());
+                        LOG_FMT(LINDENT, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                                __func__, __LINE__, whereIsCase->GetOrigLine(), whereIsCase->GetOrigCol(), whereIsCase->Text());
                         LOG_FMT(LINDENT, "%s(%d): column is %zu\n",
-                                __func__, __LINE__, whereIsCase->column);
-                        reindent_line(pc, whereIsCase->column);
+                                __func__, __LINE__, whereIsCase->GetColumn());
+                        reindent_line(pc, whereIsCase->GetColumn());
                      }
                   }
                   else
                   {
-                     LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent_column set to %zu, for '%s'\n",
-                             __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                     LOG_FMT(LINDENT, "%s(%d): orig line is %zu, indent_column set to %zu, for '%s'\n",
+                             __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
                      reindent_line(pc, indent_column);
                   }
                }
-               else if (  chunk_is_token(pc, CT_MEMBER)                      // Issue #2890
+               else if (  pc->Is(CT_MEMBER)                      // Issue #2890
                        && language_is_set(LANG_CPP))
                {
                   // comment name: XXXXXXXXXXXXXXXXXXXXXXXXXX
-                  LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent_column set to %zu, for '%s'\n",
-                          __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                  LOG_FMT(LINDENT, "%s(%d): orig line is %zu, indent_column set to %zu, for '%s'\n",
+                          __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
                   const size_t frm_size = frm.size();
                   LOG_FMT(LINDPC, "%s(%d): frm_size is %zu\n",
                           __func__, __LINE__, frm_size);
                   // get pc
-                  LOG_FMT(LINDPC, "%s(%d): Text() is '%s', (frm.at(frm_size - 1).pc)->type is %s\n",
-                          __func__, __LINE__, (frm.at(frm_size - 1).pc)->Text(), get_token_name((frm.at(frm_size - 1).pc)->type));
+                  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()));
                   // get the token before
                   const size_t temp_ttidx = frm_size - 2;
 
@@ -4182,40 +4150,40 @@ void indent_text(void)
                   else
                   {
                      Chunk *token_before = frm.at(temp_ttidx).pc;
-                     LOG_FMT(LINDPC, "%s(%d): Text() is '%s', token_before->type is %s\n",
-                             __func__, __LINE__, token_before->Text(), get_token_name(token_before->type));
+                     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()));
 
                      size_t vor_col = 0;
 
-                     if (chunk_is_token(token_before, CT_ASSIGN))
+                     if (token_before->Is(CT_ASSIGN))
                      {
                         Chunk *before_Assign = frm.at(temp_ttidx - 1).pc;
 
-                        if (before_Assign == nullptr)
+                        if (before_Assign->IsNullChunk())
                         {
                            indent_column = 1 + indent_size;
                         }
                         else
                         {
-                           vor_col = before_Assign->column;
-                           LOG_FMT(LINDPC, "%s(%d): Text() is '%s', before_Assign->type is %s, column is %zu\n",
-                                   __func__, __LINE__, before_Assign->Text(), get_token_name(before_Assign->type), vor_col);
+                           vor_col = before_Assign->GetColumn();
+                           LOG_FMT(LINDPC, "%s(%d): Text() is '%s', before_Assign->GetType() is %s, column is %zu\n",
+                                   __func__, __LINE__, before_Assign->Text(), get_token_name(before_Assign->GetType()), vor_col);
                            indent_column = vor_col + 2 * indent_size;
                         }
                      }
-                     else if (chunk_is_token(token_before, CT_BRACE_OPEN))
+                     else if (token_before->Is(CT_BRACE_OPEN))
                      {
-                        vor_col = token_before->column;
-                        LOG_FMT(LINDPC, "%s(%d): Text() is '%s', token_before->type is %s, column is %zu\n",
-                                __func__, __LINE__, token_before->Text(), get_token_name(token_before->type), vor_col);
+                        vor_col = token_before->GetColumn();
+                        LOG_FMT(LINDPC, "%s(%d): Text() is '%s', token_before->GetType() is %s, column is %zu\n",
+                                __func__, __LINE__, token_before->Text(), get_token_name(token_before->GetType()), vor_col);
                         indent_column = vor_col + 2 * indent_size;
                      }
-                     else if (chunk_is_token(token_before, CT_RETURN))
+                     else if (token_before->Is(CT_RETURN))
                      {
                         Chunk *before_Return = frm.at(temp_ttidx - 1).pc;
-                        vor_col = before_Return->column;
-                        LOG_FMT(LINDPC, "%s(%d): Text() is '%s', before_Return->type is %s, column is %zu\n",
-                                __func__, __LINE__, before_Return->Text(), get_token_name(before_Return->type), vor_col);
+                        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);
                         indent_column = vor_col + 2 * indent_size;
                      }
                      else
@@ -4228,8 +4196,8 @@ void indent_text(void)
                }
                else
                {
-                  LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent_column set to %zu, for '%s'\n",
-                          __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+                  LOG_FMT(LINDENT, "%s(%d): orig line is %zu, indent_column set to %zu, for '%s'\n",
+                          __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
                   reindent_line(pc, indent_column);
                }
             }
@@ -4237,37 +4205,37 @@ void indent_text(void)
             {
                // do not indent this line
                LOG_FMT(LINDENT, "%s(%d): %zu] don't indent this line\n",
-                       __func__, __LINE__, pc->orig_line);
+                       __func__, __LINE__, pc->GetOrigLine());
             }
          }
          did_newline = false;
 
-         if (  chunk_is_token(pc, CT_SQL_EXEC)
-            || chunk_is_token(pc, CT_SQL_BEGIN)
-            || chunk_is_token(pc, CT_SQL_END))
+         if (  pc->Is(CT_SQL_EXEC)
+            || pc->Is(CT_SQL_BEGIN)
+            || pc->Is(CT_SQL_END))
          {
-            sql_col      = pc->column;
-            sql_orig_col = pc->orig_col;
+            sql_col      = pc->GetColumn();
+            sql_orig_col = pc->GetOrigCol();
          }
 
          // Handle indent for variable defs at the top of a block of code
-         if (pc->flags.test(PCF_VAR_TYPE))
+         if (pc->TestFlags(PCF_VAR_TYPE))
          {
             if (  !frm.top().non_vardef
                && (frm.top().type == CT_BRACE_OPEN))
             {
                log_rule_B("indent_var_def_blk");
-               const auto val = options::indent_var_def_blk();
+               int val = options::indent_var_def_blk();
 
                if (val != 0)
                {
-                  auto indent = indent_column;
-                  indent = (val > 0) ? val                     // reassign if positive val,
-                           : (cast_abs(indent, val) < indent)  // else if no underflow
-                           ? (indent + val) : 0;               // reduce, else 0
+                  size_t indent = indent_column;
+                  indent = (val > 0) ? val                  // reassign if positive val,
+                           : ((size_t)(abs(val)) < indent)  // else if no underflow
+                           ? (indent + val) : 0;            // reduce, else 0
 
                   LOG_FMT(LINDENT, "%s(%d): %zu] var_type indent => %zu [%s]\n",
-                          __func__, __LINE__, pc->orig_line, indent, pc->Text());
+                          __func__, __LINE__, pc->GetOrigLine(), indent, pc->Text());
                   reindent_line(pc, indent);
                }
             }
@@ -4279,9 +4247,9 @@ void indent_text(void)
       }
 
       // if we hit a newline, reset indent_tmp
-      if (  chunk_is_newline(pc)
-         || chunk_is_token(pc, CT_COMMENT_MULTI)
-         || chunk_is_token(pc, CT_COMMENT_CPP))
+      if (  pc->IsNewline()
+         || pc->Is(CT_COMMENT_MULTI)
+         || pc->Is(CT_COMMENT_CPP))
       {
          log_indent();
          frm.top().indent_tmp = frm.top().indent;
@@ -4291,8 +4259,9 @@ void indent_text(void)
           * Handle the case of a multi-line #define w/o anything on the
           * first line (indent_tmp will be 1 or 0)
           */
-         if (  chunk_is_token(pc, CT_NL_CONT)
-            && (frm.top().indent_tmp <= indent_size))
+         if (  pc->Is(CT_NL_CONT)
+            && frm.top().indent_tmp <= indent_size
+            && frm.top().type != CT_PP_DEFINE)
          {
             frm.top().indent_tmp = indent_size + 1;
             log_indent_tmp();
@@ -4304,15 +4273,15 @@ void indent_text(void)
       log_rule_B("indent_xml_string");
 
       if (  options::indent_xml_string() > 0
-         && chunk_is_token(pc, CT_STRING)
+         && pc->Is(CT_STRING)
          && pc->Len() > 4
-         && pc->str[1] == '<'
-         && pc->str[2] != '/'
-         && pc->str[pc->Len() - 3] != '/')
+         && pc->GetStr()[1] == '<'
+         && pc->GetStr()[2] != '/'
+         && pc->GetStr()[pc->Len() - 3] != '/')
       {
          if (xml_indent <= 0)
          {
-            xml_indent = pc->column;
+            xml_indent = pc->GetColumn();
          }
          log_rule_B("indent_xml_string");
          xml_indent += options::indent_xml_string();
@@ -4320,14 +4289,14 @@ void indent_text(void)
       // Issue #672
       log_rule_B("indent_continue_class_head");
 
-      if (  chunk_is_token(pc, CT_CLASS)
+      if (  pc->Is(CT_CLASS)
          && language_is_set(LANG_CPP | LANG_JAVA)
          && (  options::indent_ignore_first_continue()
             || options::indent_continue_class_head() != 0)
          && !classFound)
       {
-         LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, CT_CLASS found, OPEN IT\n",
-                 __func__, __LINE__, pc->orig_line);
+         LOG_FMT(LINDENT, "%s(%d): orig line is %zu, CT_CLASS found, OPEN IT\n",
+                 __func__, __LINE__, pc->GetOrigLine());
          frm.push(pc, __func__, __LINE__);
 
          if (options::indent_ignore_first_continue())
@@ -4346,8 +4315,13 @@ void indent_text(void)
          classFound = true;
       }
       pc = pc->GetNext();
-      LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+
+      if (pc->Is(CT_SPACE))                       // Issue #3710
+      {
+         pc = pc->GetNext();
+      }
+      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()));
    }
 null_pc:
 
@@ -4373,7 +4347,7 @@ null_pc:
               __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));
-      cpd.error_count++;
+      exit(EX_IOERR);
    }
 
    LOG_FMT(LINDLINE, "%s(%d): before quick_align_again\n", __func__, __LINE__);
@@ -4387,36 +4361,31 @@ static bool single_line_comment_indent_rule_applies(Chunk *start, bool forward)
 {
    LOG_FUNC_ENTRY();
 
-   if (!chunk_is_single_line_comment(start))
+   if (!start->IsSingleLineComment())
    {
       return(false);
    }
-   Chunk *pc = start;
-
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
+   Chunk  *pc      = start;
    size_t nl_count = 0;
 
    while ((pc = forward ? pc->GetNext() : pc->GetPrev())->IsNotNullChunk())
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          if (  nl_count > 0
-            || pc->nl_count > 1)
+            || pc->GetNlCount() > 1)
          {
             return(false);
          }
          nl_count++;
       }
-      else if (chunk_is_single_line_comment(pc))
+      else if (pc->IsSingleLineComment())
       {
          nl_count = 0;
       }
-      else if (  chunk_is_token(pc, CT_COMMENT_MULTI)
-              || (forward && chunk_is_closing_brace(pc))
-              || (!forward && chunk_is_opening_brace(pc)))
+      else if (  pc->Is(CT_COMMENT_MULTI)
+              || (forward && pc->IsBraceClose())
+              || (!forward && pc->IsBraceOpen()))
       {
          /*
           * check for things we wouldn't want to indent the comment for
@@ -4438,13 +4407,13 @@ static bool is_end_of_assignment(Chunk *pc, const ParseFrame &frm)
    return(  (  frm.top().type == CT_ASSIGN_NL
             || frm.top().type == CT_MEMBER
             || frm.top().type == CT_ASSIGN)
-         && (  chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_COMMA)
-            || chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_token(pc, CT_SPAREN_CLOSE)
-            || (  chunk_is_token(pc, CT_SQUARE_OPEN)
-               && get_chunk_parent_type(pc) == CT_ASSIGN))
-         && get_chunk_parent_type(pc) != CT_CPP_LAMBDA);
+         && (  pc->IsSemicolon()
+            || pc->Is(CT_COMMA)
+            || pc->Is(CT_BRACE_OPEN)
+            || pc->Is(CT_SPAREN_CLOSE)
+            || (  pc->Is(CT_SQUARE_OPEN)
+               && pc->GetParentType() == CT_ASSIGN))
+         && pc->GetParentType() != CT_CPP_LAMBDA);
 }
 
 
@@ -4461,11 +4430,11 @@ static size_t calc_comment_next_col_diff(Chunk *pc)
    do
    {
       Chunk *newline_token = next->GetNext();
-      LOG_FMT(LCMTIND, "%s(%d): newline_token->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, newline_token->Text(), newline_token->orig_line, newline_token->orig_col);
+      LOG_FMT(LCMTIND, "%s(%d): newline_token->Text() is '%s', orig line is %zu, orig col is %zu\n",
+              __func__, __LINE__, newline_token->Text(), newline_token->GetOrigLine(), newline_token->GetOrigCol());
 
       if (  newline_token->IsNullChunk()
-         || newline_token->nl_count > 1)
+         || newline_token->GetNlCount() > 1)
       {
          return(5000);  // FIXME: Max thresh magic number 5000
       }
@@ -4473,8 +4442,8 @@ static size_t calc_comment_next_col_diff(Chunk *pc)
 
       if (next->IsNotNullChunk())
       {
-         LOG_FMT(LCMTIND, "%s(%d): next->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, next->Text(), next->orig_line, next->orig_col);
+         LOG_FMT(LCMTIND, "%s(%d): next->Text() is '%s', orig line is %zu, orig col is %zu\n",
+                 __func__, __LINE__, next->Text(), next->GetOrigLine(), next->GetOrigCol());
       }
    } while (next->IsComment());
 
@@ -4485,9 +4454,9 @@ static size_t calc_comment_next_col_diff(Chunk *pc)
    LOG_FMT(LCMTIND, "%s(%d): next->Text() is '%s'\n",
            __func__, __LINE__, next->Text());
    // here next is the first non comment, non newline token
-   return(next->orig_col > pc->orig_col
-          ? next->orig_col - pc->orig_col
-          : pc->orig_col - next->orig_col);
+   return(next->GetOrigCol() > pc->GetOrigCol()
+          ? next->GetOrigCol() - pc->GetOrigCol()
+          : pc->GetOrigCol() - next->GetOrigCol());
 }
 
 
@@ -4496,15 +4465,15 @@ static void indent_comment(Chunk *pc, size_t col)
    LOG_FUNC_ENTRY();
    char copy[1000];
 
-   LOG_FMT(LCMTIND, "%s(%d): pc->Text() is '%s', orig_line %zu, orig_col %zu, level %zu\n",
-           __func__, __LINE__, pc->ElidedText(copy), pc->orig_line, pc->orig_col, pc->level);
+   LOG_FMT(LCMTIND, "%s(%d): pc->Text() is '%s', orig line %zu, orig col %zu, level %zu\n",
+           __func__, __LINE__, pc->ElidedText(copy), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
 
    // force column 1 comment to column 1 if not changing them
    log_rule_B("indent_col1_comment");
 
-   if (  pc->orig_col == 1
+   if (  pc->GetOrigCol() == 1
       && !options::indent_col1_comment()
-      && !pc->flags.test(PCF_INSERTED))
+      && !pc->TestFlags(PCF_INSERTED))
    {
       LOG_FMT(LCMTIND, "%s(%d): rule 1 - keep in col 1\n", __func__, __LINE__);
       reindent_line(pc, 1);
@@ -4514,27 +4483,27 @@ static void indent_comment(Chunk *pc, size_t col)
 
    if (nl->IsNotNullChunk())
    {
-      LOG_FMT(LCMTIND, "%s(%d): nl->Text() is '%s', orig_line %zu, orig_col %zu, level %zu\n",
-              __func__, __LINE__, nl->Text(), nl->orig_line, nl->orig_col, nl->level);
+      LOG_FMT(LCMTIND, "%s(%d): nl->Text() is '%s', orig line %zu, orig col %zu, level %zu\n",
+              __func__, __LINE__, nl->Text(), nl->GetOrigLine(), nl->GetOrigCol(), nl->GetLevel());
    }
 
-   if (pc->orig_col > 1)
+   if (pc->GetOrigCol() > 1)
    {
       Chunk *prev = nl->GetPrev();
 
       if (prev->IsNotNullChunk())
       {
-         LOG_FMT(LCMTIND, "%s(%d): prev->Text() is '%s', orig_line %zu, orig_col %zu, level %zu\n",
-                 __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col, prev->level);
-         log_pcf_flags(LCMTIND, prev->flags);
+         LOG_FMT(LCMTIND, "%s(%d): prev->Text() is '%s', orig line %zu, orig col %zu, level %zu\n",
+                 __func__, __LINE__, prev->Text(), prev->GetOrigLine(), prev->GetOrigCol(), prev->GetLevel());
+         log_pcf_flags(LCMTIND, prev->GetFlags());
       }
 
       if (  prev->IsComment()
-         && nl->nl_count == 1)
+         && nl->GetNlCount() == 1)
       {
-         const size_t prev_col_diff = (prev->orig_col > pc->orig_col)
-                                      ? prev->orig_col - pc->orig_col
-                                      : pc->orig_col - prev->orig_col;
+         const size_t prev_col_diff = (prev->GetOrigCol() > pc->GetOrigCol())
+                                      ? prev->GetOrigCol() - pc->GetOrigCol()
+                                      : pc->GetOrigCol() - prev->GetOrigCol();
          LOG_FMT(LCMTIND, "%s(%d): prev_col_diff is %zu\n",
                  __func__, __LINE__, prev_col_diff);
 
@@ -4545,11 +4514,11 @@ static void indent_comment(Chunk *pc, size_t col)
          if (prev_col_diff <= options::indent_comment_align_thresh())
          {
             LOG_FMT(LCMTIND, "%s(%d): prev->Text() is '%s', Doxygen_comment(prev) is %s\n",
-                    __func__, __LINE__, prev->Text(), chunk_is_Doxygen_comment(prev) ? "TRUE" : "FALSE");
+                    __func__, __LINE__, prev->Text(), prev->IsDoxygenComment() ? "TRUE" : "FALSE");
             LOG_FMT(LCMTIND, "%s(%d): pc->Text() is '%s', Doxygen_comment(pc) is %s\n",
-                    __func__, __LINE__, pc->Text(), chunk_is_Doxygen_comment(pc) ? "TRUE" : "FALSE");
+                    __func__, __LINE__, pc->Text(), pc->IsDoxygenComment() ? "TRUE" : "FALSE");
 
-            if (chunk_is_Doxygen_comment(prev) == chunk_is_Doxygen_comment(pc))
+            if (prev->IsDoxygenComment() == pc->IsDoxygenComment())
             {
                const size_t next_col_diff = calc_comment_next_col_diff(pc);
                LOG_FMT(LCMTIND, "%s(%d): next_col_diff is %zu\n",
@@ -4560,8 +4529,8 @@ static void indent_comment(Chunk *pc, size_t col)
                   || next_col_diff == 5000) // FIXME: Max thresh magic number 5000
                {
                   LOG_FMT(LCMTIND, "%s(%d): rule 3 - prev comment, coldiff = %zu, now in %zu\n",
-                          __func__, __LINE__, prev_col_diff, pc->column);
-                  reindent_line(pc, prev->column);
+                          __func__, __LINE__, prev_col_diff, pc->GetColumn());
+                  reindent_line(pc, prev->GetColumn());
                   return;
                }
             }
@@ -4575,7 +4544,7 @@ static void indent_comment(Chunk *pc, size_t col)
       && single_line_comment_indent_rule_applies(pc, true))
    {
       LOG_FMT(LCMTIND, "%s(%d): rule 4 - indent single line comments before code, now in %zu\n",
-              __func__, __LINE__, pc->column);
+              __func__, __LINE__, pc->GetColumn());
       reindent_line(pc, col + options::indent_single_line_comments_before());
       return;
    }
@@ -4586,17 +4555,17 @@ static void indent_comment(Chunk *pc, size_t col)
       && single_line_comment_indent_rule_applies(pc, false))
    {
       LOG_FMT(LCMTIND, "%s(%d): rule 4 - indent single line comments after code, now in %zu\n",
-              __func__, __LINE__, pc->column);
+              __func__, __LINE__, pc->GetColumn());
       reindent_line(pc, col + options::indent_single_line_comments_after());
       return;
    }
    log_rule_B("indent_comment");
 
-   if (  pc->orig_col > 1
+   if (  pc->GetOrigCol() > 1
       && !options::indent_comment())
    {
-      LOG_FMT(LCMTIND, "%s(%d): rule 5 - keep in orig_col\n", __func__, __LINE__);
-      reindent_line(pc, pc->orig_col);
+      LOG_FMT(LCMTIND, "%s(%d): rule 5 - keep in orig col\n", __func__, __LINE__);
+      reindent_line(pc, pc->GetOrigCol());
       return;
    }
    LOG_FMT(LCMTIND, "%s(%d): rule 6 - fall-through, stay in %zu\n",
@@ -4605,7 +4574,7 @@ static void indent_comment(Chunk *pc, size_t col)
 } // indent_comment
 
 
-bool ifdef_over_whole_file(void)
+bool ifdef_over_whole_file()
 {
    LOG_FUNC_ENTRY();
 
@@ -4628,11 +4597,10 @@ bool ifdef_over_whole_file(void)
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      LOG_FMT(LNOTE, "%s(%d): pc->pp_level is %zu, pc->orig_line is %zu, pc->orig_col is %zu, pc->Text() is '%s'\n",
-              __func__, __LINE__, pc->pp_level, pc->orig_line, pc->orig_col, pc->Text());
+      LOG_FMT(LNOTE, "%s(%d): pc->pp level is %zu, pc orig line is %zu, orig col is %zu, pc->Text() is '%s'\n",
+              __func__, __LINE__, pc->GetPpLevel(), pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
 
-      if (  pc->IsComment()
-         || chunk_is_newline(pc))
+      if (pc->IsCommentOrNewline())
       {
          continue;
       }
@@ -4640,14 +4608,14 @@ bool ifdef_over_whole_file(void)
       if (IFstage == 0)                   // 0 is BEGIN
       {
          // Check the first preprocessor, make sure it is an #if type
-         if (pc->type != CT_PREPROC)
+         if (pc->IsNot(CT_PREPROC))
          {
             break;
          }
          Chunk *next = pc->GetNext();
 
          if (  next->IsNullChunk()
-            || next->type != CT_PP_IF)
+            || next->IsNot(CT_PP_IF))
          {
             break;
          }
@@ -4657,9 +4625,9 @@ bool ifdef_over_whole_file(void)
       else if (IFstage == 1)                // 1 is CT_PP_IF found
       {
          // Scan until a preprocessor at level 0 is found - the close to the #if
-         if (chunk_is_token(pc, CT_PREPROC))
+         if (pc->Is(CT_PREPROC))
          {
-            if (pc->pp_level == 0)
+            if (pc->GetPpLevel() == 0)
             {
                IFstage = 2;
                end_pp  = pc;
@@ -4670,8 +4638,8 @@ bool ifdef_over_whole_file(void)
       else if (IFstage == 2)
       {
          // We should only see the rest of the preprocessor
-         if (  chunk_is_token(pc, CT_PREPROC)
-            || !pc->flags.test(PCF_IN_PREPROC))
+         if (  pc->Is(CT_PREPROC)
+            || !pc->TestFlags(PCF_IN_PREPROC))
          {
             IFstage = 0;
             break;
@@ -4683,8 +4651,8 @@ bool ifdef_over_whole_file(void)
 
    if (cpd.ifdef_over_whole_file > 0)
    {
-      chunk_flags_set(start_pp, PCF_WF_IF);
-      chunk_flags_set(end_pp, PCF_WF_ENDIF);
+      start_pp->SetFlagBits(PCF_WF_IF);
+      end_pp->SetFlagBits(PCF_WF_ENDIF);
    }
    LOG_FMT(LNOTE, "The whole file is%s covered by a #IF\n",
            (cpd.ifdef_over_whole_file > 0) ? "" : " NOT");
@@ -4692,7 +4660,7 @@ bool ifdef_over_whole_file(void)
 } // ifdef_over_whole_file
 
 
-void indent_preproc(void)
+void indent_preproc()
 {
    LOG_FUNC_ENTRY();
 
@@ -4701,10 +4669,10 @@ void indent_preproc(void)
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      LOG_FMT(LPPIS, "%s(%d): orig_line is %zu, orig_col is %zu, pc->Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+      LOG_FMT(LPPIS, "%s(%d): orig line is %zu, orig col is %zu, pc->Text() is '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
 
-      if (pc->type != CT_PREPROC)
+      if (pc->IsNot(CT_PREPROC))
       {
          continue;
       }
@@ -4714,63 +4682,60 @@ void indent_preproc(void)
       {
          break;
       }
-      const size_t pp_level = (pc->pp_level > pp_level_sub)
-                              ? pc->pp_level - pp_level_sub : 0;
+      const size_t pp_level = (pc->GetPpLevel() > pp_level_sub)
+                              ? pc->GetPpLevel() - pp_level_sub : 0;
 
       // Adjust the indent of the '#'
-      log_rule_B("pp_indent");
-
       if (options::pp_indent() & IARF_ADD)
       {
-         log_rule_B("pp_indent_count");
+         log_rule_B("pp_indent ADD");
          reindent_line(pc, 1 + pp_level * options::pp_indent_count());
       }
       else if (options::pp_indent() & IARF_REMOVE)
       {
-         log_rule_B("pp_indent");
+         log_rule_B("pp_indent REMOVE");
          reindent_line(pc, 1);
       }
       // Add spacing by adjusting the length
-      log_rule_B("pp_space");
+      log_rule_B("pp_space_after");
 
-      if (  (options::pp_space() != IARF_IGNORE)
-         && next != nullptr)
+      if (  (options::pp_space_after() != IARF_IGNORE)
+         && next->IsNotNullChunk())
       {
-         if (options::pp_space() & IARF_ADD)
+         if (options::pp_space_after() & IARF_ADD)
          {
-            log_rule_B("pp_space_count");
-            // Issue #3055
-            const size_t mult = max<size_t>(options::pp_space_count(), 1);
-            reindent_line(next, pc->column + pc->Len() + (pp_level * mult));
+            log_rule_B("pp_space_after ADD");
+            const size_t mult = options::pp_space_count();
+            reindent_line(next, pc->GetColumn() + pc->Len() + (pp_level * mult));
          }
-         else if (options::pp_space() & IARF_REMOVE)
+         else if (options::pp_space_after() & IARF_REMOVE)
          {
-            log_rule_B("pp_space");
-            reindent_line(next, pc->column + pc->Len());
+            log_rule_B("pp_space_after REMOVE");
+            reindent_line(next, pc->GetColumn() + pc->Len());
          }
       }
       // Mark as already handled if not region stuff or in column 1
       log_rule_B("pp_indent_at_level");
 
-      bool at_file_level = pc->brace_level <= ((get_chunk_parent_type(pc) == CT_PP_DEFINE) ? 1 : 0);
+      bool at_file_level = pc->GetBraceLevel() <= ((pc->GetParentType() == CT_PP_DEFINE) ? 1 : 0);
 
       if (  (  (  at_file_level
                && !options::pp_indent_at_level0())
             || (  !at_file_level
                && !options::pp_indent_at_level()))
-         && get_chunk_parent_type(pc) != CT_PP_REGION
-         && get_chunk_parent_type(pc) != CT_PP_ENDREGION)
+         && pc->GetParentType() != CT_PP_REGION
+         && pc->GetParentType() != CT_PP_ENDREGION)
       {
          log_rule_B("pp_define_at_level");
 
          if (  !options::pp_define_at_level()
-            || get_chunk_parent_type(pc) != CT_PP_DEFINE)
+            || pc->GetParentType() != CT_PP_DEFINE)
          {
-            chunk_flags_set(pc, PCF_DONT_INDENT);
+            pc->SetFlagBits(PCF_DONT_INDENT);
          }
       }
-      LOG_FMT(LPPIS, "%s(%d): orig_line %zu to %zu (len %zu, next->col %zu)\n",
-              __func__, __LINE__, pc->orig_line, 1 + pp_level, pc->Len(),
-              next ? next->column : -1);
+      LOG_FMT(LPPIS, "%s(%d): orig line %zu to %zu (len %zu, next->col %zu)\n",
+              __func__, __LINE__, pc->GetOrigLine(), 1 + pp_level, pc->Len(),
+              next ? next->GetColumn() : -1);
    }
 } // indent_preproc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.h
index 9e91a94a..e1fe384c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.h
@@ -16,7 +16,7 @@
  * the chunk structures.
  * The level indicator must already be set.
  */
-void indent_text(void);
+void indent_text();
 
 
 /**
@@ -24,7 +24,7 @@ void indent_text(void);
  * FIXME: This is broken if there is a comment or escaped newline
  * between '#' and 'define'.
  */
-void indent_preproc(void);
+void indent_preproc();
 
 /**
  *
@@ -44,7 +44,7 @@ void align_to_column(Chunk *pc, size_t column);
 
 
 //! Scan to see if the whole file is covered by one #ifdef
-bool ifdef_over_whole_file(void);
+bool ifdef_over_whole_file();
 
 
 /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.cpp
index 78fb2134..6b4757ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.cpp
@@ -50,7 +50,7 @@ static const chunk_tag_t *kw_static_first(const chunk_tag_t *tag);
 static const chunk_tag_t *kw_static_match(bool orig_list, const chunk_tag_t *tag, int lang_flags);
 
 /**
- * selected keywords for the choosed language.
+ * selected keywords for the chosen language.
  */
 
 static chunk_tag_t keyword_for_lang[uncrustify::limits::MAX_KEYWORDS];
@@ -87,6 +87,11 @@ static chunk_tag_t keywords[] =
    { "API_DEPRECATED_WITH_REPLACEMENT", CT_ATTRIBUTE,        LANG_OC                                                                     },
    { "API_UNAVAILABLE",                 CT_ATTRIBUTE,        LANG_OC                                                                     },
    { "BOOL",                            CT_TYPE,             LANG_OC                                                                     },
+   { "INT16_C",                         CT_TYPE,             LANG_CPP                                                                    },
+   { "INT32_C",                         CT_TYPE,             LANG_CPP                                                                    },
+   { "INT64_C",                         CT_TYPE,             LANG_CPP                                                                    },
+   { "INT8_C",                          CT_TYPE,             LANG_CPP                                                                    },
+   { "INTMAX_C",                        CT_TYPE,             LANG_CPP                                                                    },
    { "NS_ENUM",                         CT_ENUM,             LANG_OC                                                                     },
    { "NS_OPTIONS",                      CT_ENUM,             LANG_OC                                                                     },
    { "Q_EMIT",                          CT_Q_EMIT,           LANG_CPP                                                                    },
@@ -95,6 +100,11 @@ static chunk_tag_t keywords[] =
    { "Q_GADGET",                        CT_Q_GADGET,         LANG_CPP                                                                    },
    { "Q_OBJECT",                        CT_COMMENT_EMBED,    LANG_CPP                                                                    },
    { "Q_SIGNALS",                       CT_ACCESS,           LANG_CPP                                                                    },
+   { "UINT16_C",                        CT_TYPE,             LANG_CPP                                                                    },
+   { "UINT32_C",                        CT_TYPE,             LANG_CPP                                                                    },
+   { "UINT64_C",                        CT_TYPE,             LANG_CPP                                                                    },
+   { "UINT8_C",                         CT_TYPE,             LANG_CPP                                                                    },
+   { "UINTMAX_C",                       CT_TYPE,             LANG_CPP                                                                    },
    { "_Bool",                           CT_TYPE,             LANG_C | LANG_CPP                                                           },
    { "_Complex",                        CT_TYPE,             LANG_C | LANG_CPP                                                           },
    { "_Imaginary",                      CT_TYPE,             LANG_C | LANG_CPP                                                           },
@@ -117,7 +127,7 @@ static chunk_tag_t keywords[] =
    { "__declspec",                      CT_DECLSPEC,         LANG_C | LANG_CPP                                                           },
    { "__except",                        CT_CATCH,            LANG_C | LANG_CPP                                                           },
    { "__finally",                       CT_FINALLY,          LANG_C | LANG_CPP                                                           },
-   { "__has_include",                   CT_CNG_HASINC,       LANG_C | LANG_CPP | FLAG_PP                                                 },
+   { "__has_include",                   CT_CNG_HASINC,       LANG_C | LANG_CPP | LANG_OC | FLAG_PP                                       },
    { "__has_include_next",              CT_CNG_HASINCN,      LANG_C | LANG_CPP | FLAG_PP                                                 },
    { "__inline__",                      CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
    { "__nonnull",                       CT_QUALIFIER,        LANG_OC                                                                     },
@@ -204,6 +214,7 @@ static chunk_tag_t keywords[] =
    { "endscript",                       CT_PP_ENDINPUT,      LANG_PAWN | FLAG_PP                                                         },
    { "enum",                            CT_ENUM,             LANG_ALL                                                                    },
    { "error",                           CT_PP_ERROR,         LANG_PAWN | FLAG_PP                                                         },
+   { "errordomain",                     CT_ENUM,             LANG_VALA                                                                   },
    { "event",                           CT_TYPE,             LANG_CS                                                                     },
    { "exit",                            CT_FUNCTION,         LANG_PAWN                                                                   },
    { "explicit",                        CT_QUALIFIER,        LANG_CPP | LANG_CS                                                          },
@@ -242,7 +253,7 @@ static chunk_tag_t keywords[] =
    { "instanceof",                      CT_SIZEOF,           LANG_JAVA | LANG_ECMA                                                       },
    { "int",                             CT_TYPE,             LANG_ALLC                                                                   },
    { "interface",                       CT_CLASS,            LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA             },
-   { "internal",                        CT_QUALIFIER,        LANG_CS                                                                     },
+   { "internal",                        CT_QUALIFIER,        LANG_CS | LANG_VALA                                                         },
    { "invariant",                       CT_INVARIANT,        LANG_D                                                                      },
    { "ireal",                           CT_TYPE,             LANG_D                                                                      },
    { "is",                              CT_SCOMPARE,         LANG_D | LANG_CS | LANG_VALA                                                },
@@ -341,7 +352,7 @@ static chunk_tag_t keywords[] =
    { "unsigned",                        CT_TYPE,             LANG_C | LANG_CPP                                                           },
    { "ushort",                          CT_TYPE,             LANG_CS | LANG_VALA | LANG_D                                                },
    { "using",                           CT_USING,            LANG_CPP | LANG_CS | LANG_VALA                                              },
-   { "var",                             CT_TYPE,             LANG_VALA | LANG_ECMA                                                       },
+   { "var",                             CT_TYPE,             LANG_CS | LANG_VALA | LANG_ECMA                                             },
    { "version",                         CT_D_VERSION,        LANG_D                                                                      },
    { "virtual",                         CT_QUALIFIER,        LANG_CPP | LANG_CS | LANG_VALA                                              },
    { "void",                            CT_TYPE,             LANG_ALLC                                                                   },
@@ -397,7 +408,7 @@ static int kw_compare(const void *p1, const void *p2)
 } // kw_compare
 
 
-bool keywords_are_sorted(void)
+bool keywords_are_sorted()
 {
    size_t keywords_count = ARRAY_SIZE(keywords);
 
@@ -408,10 +419,9 @@ bool keywords_are_sorted(void)
          fprintf(stderr, "%s: bad sort order at idx %d, words '%s' and '%s'\n",
                  __func__, (int)idx - 1, keywords[idx - 1].tag, keywords[idx].tag);
          // coveralls will always complain.
-         // these lines are only needed for the developper.
+         // these lines are only needed for the developer.
          log_flush(true);
-         cpd.error_count++;
-         return(false);
+         exit(EX_SOFTWARE);
       }
    }
 
@@ -442,7 +452,7 @@ static const chunk_tag_t *kw_static_first(const chunk_tag_t *tag)
 {
    const chunk_tag_t *prev = tag - 1;
 
-   // TODO: avoid pointer arithmetics
+   // TODO: avoid pointer arithmetic
    // loop over static keyword array
    while (  prev >= &keyword_for_lang[0]        // not at beginning of keyword array
          && strcmp(prev->tag, tag->tag) == 0)   // tags match
@@ -521,8 +531,7 @@ int load_keyword_file(const char *filename)
    {
       LOG_FMT(LERR, "%s: fopen(%s) failed: %s (%d)\n",
               __func__, filename, strerror(errno), errno);
-      cpd.error_count++;
-      return(EX_IOERR);
+      exit(EX_IOERR);
    }
    const int max_line_length = 256;
    const int max_arg_count   = 2;
@@ -557,7 +566,7 @@ int load_keyword_file(const char *filename)
          {
             LOG_FMT(LWARN, "%s:%zu Invalid line (starts with '%s')\n",
                     filename, line_no, args[0]);
-            cpd.error_count++;
+            exit(EX_SOFTWARE);
          }
       }
       else
@@ -613,7 +622,7 @@ void print_custom_keywords(FILE *pfile)
 } // print_custom_keywords
 
 
-void clear_keyword_file(void)
+void clear_keyword_file()
 {
    dkwm.clear();
 } // clear_keyword_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.h
index 95c41aad..7dc431c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.h
@@ -36,7 +36,7 @@
  *            void);
  *    };
  */
-void init_keywords_for_language(void);
+void init_keywords_for_language();
 
 /**
  * Loads the dynamic keywords from a file
@@ -72,14 +72,14 @@ void add_keyword(const std::string &tag, E_Token type);
 void print_custom_keywords(FILE *pfile);
 
 
-void clear_keyword_file(void);
+void clear_keyword_file();
 
 
 //! Returns the pattern that the keyword needs based on the token
 pattern_class_e get_token_pattern_class(E_Token tok);
 
 
-bool keywords_are_sorted(void);
+bool keywords_are_sorted();
 
 
 #endif /* KEYWORDS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.cpp
index 77831f55..70722c74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.cpp
@@ -58,40 +58,33 @@ Chunk *pawn_add_vsemi_after(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (  chunk_is_token(pc, CT_VSEMICOLON)
-      || chunk_is_token(pc, CT_SEMICOLON))
+   if (pc->IsSemicolon())
    {
       return(pc);
    }
-
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
    Chunk *next = pc->GetNextNc();
 
    if (  next->IsNotNullChunk()
-      && (  chunk_is_token(next, CT_VSEMICOLON)
-         || chunk_is_token(next, CT_SEMICOLON)))
+      && next->IsSemicolon())
    {
       return(pc);
    }
    Chunk chunk = *pc;
 
-   set_chunk_type(&chunk, CT_VSEMICOLON);
-   set_chunk_parent(&chunk, CT_NONE);
-   chunk.str     = options::mod_pawn_semicolon() ? ";" : "";
-   chunk.column += pc->Len();
+   chunk.SetType(CT_VSEMICOLON);
+   chunk.SetParentType(CT_NONE);
+   chunk.Str() = options::mod_pawn_semicolon() ? ";" : "";
+   chunk.SetColumn(pc->GetColumn() + pc->Len());
 
    LOG_FMT(LPVSEMI, "%s: Added VSEMI on line %zu, prev='%s' [%s]\n",
-           __func__, pc->orig_line, pc->Text(),
-           get_token_name(pc->type));
+           __func__, pc->GetOrigLine(), pc->Text(),
+           get_token_name(pc->GetType()));
 
-   return(chunk_add_after(&chunk, pc));
+   return(chunk.CopyAndAddAfter(pc));
 }
 
 
-void pawn_scrub_vsemi(void)
+void pawn_scrub_vsemi()
 {
    constexpr static auto LCURRENT = LPVSEMI;
 
@@ -106,21 +99,21 @@ void pawn_scrub_vsemi(void)
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (pc->type != CT_VSEMICOLON)
+      if (pc->IsNot(CT_VSEMICOLON))
       {
          continue;
       }
       Chunk *prev = pc->GetPrevNcNnl();
 
-      if (chunk_is_token(prev, CT_BRACE_CLOSE))
+      if (prev->Is(CT_BRACE_CLOSE))
       {
-         if (  get_chunk_parent_type(prev) == CT_IF
-            || get_chunk_parent_type(prev) == CT_ELSE
-            || get_chunk_parent_type(prev) == CT_SWITCH
-            || get_chunk_parent_type(prev) == CT_CASE
-            || get_chunk_parent_type(prev) == CT_WHILE_OF_DO)
+         if (  prev->GetParentType() == CT_IF
+            || prev->GetParentType() == CT_ELSE
+            || prev->GetParentType() == CT_SWITCH
+            || prev->GetParentType() == CT_CASE
+            || prev->GetParentType() == CT_WHILE_OF_DO)
          {
-            pc->str.clear();
+            pc->Str().clear();
          }
       }
    }
@@ -136,36 +129,36 @@ static bool pawn_continued(Chunk *pc, size_t br_level)
       return(false);
    }
 
-   if (  pc->level > br_level
-      || chunk_is_token(pc, CT_ARITH)
-      || chunk_is_token(pc, CT_SHIFT)
-      || chunk_is_token(pc, CT_CARET)
-      || chunk_is_token(pc, CT_QUESTION)
-      || chunk_is_token(pc, CT_BOOL)
-      || chunk_is_token(pc, CT_ASSIGN)
-      || chunk_is_token(pc, CT_COMMA)
-      || chunk_is_token(pc, CT_COMPARE)
-      || chunk_is_token(pc, CT_IF)
-      || chunk_is_token(pc, CT_ELSE)
-      || chunk_is_token(pc, CT_DO)
-      || chunk_is_token(pc, CT_SWITCH)
-      || chunk_is_token(pc, CT_WHILE)
-      || chunk_is_token(pc, CT_BRACE_OPEN)
-      || chunk_is_token(pc, CT_VBRACE_OPEN)
-      || chunk_is_token(pc, CT_FPAREN_OPEN)
-      || get_chunk_parent_type(pc) == CT_IF
-      || get_chunk_parent_type(pc) == CT_ELSE
-      || get_chunk_parent_type(pc) == CT_ELSEIF
-      || get_chunk_parent_type(pc) == CT_DO
-      || get_chunk_parent_type(pc) == CT_FOR
-      || get_chunk_parent_type(pc) == CT_SWITCH
-      || get_chunk_parent_type(pc) == CT_WHILE
-      || get_chunk_parent_type(pc) == CT_FUNC_DEF
-      || get_chunk_parent_type(pc) == CT_ENUM
-      || pc->flags.test_any(PCF_IN_ENUM | PCF_IN_STRUCT)
-      || chunk_is_str(pc, ":")
-      || chunk_is_str(pc, "+")
-      || chunk_is_str(pc, "-"))
+   if (  pc->GetLevel() > br_level
+      || pc->Is(CT_ARITH)
+      || pc->Is(CT_SHIFT)
+      || pc->Is(CT_CARET)
+      || pc->Is(CT_QUESTION)
+      || pc->Is(CT_BOOL)
+      || pc->Is(CT_ASSIGN)
+      || pc->Is(CT_COMMA)
+      || pc->Is(CT_COMPARE)
+      || pc->Is(CT_IF)
+      || pc->Is(CT_ELSE)
+      || pc->Is(CT_DO)
+      || pc->Is(CT_SWITCH)
+      || pc->Is(CT_WHILE)
+      || pc->Is(CT_BRACE_OPEN)
+      || pc->Is(CT_VBRACE_OPEN)
+      || pc->Is(CT_FPAREN_OPEN)
+      || pc->GetParentType() == CT_IF
+      || pc->GetParentType() == CT_ELSE
+      || pc->GetParentType() == CT_ELSEIF
+      || pc->GetParentType() == CT_DO
+      || pc->GetParentType() == CT_FOR
+      || pc->GetParentType() == CT_SWITCH
+      || pc->GetParentType() == CT_WHILE
+      || pc->GetParentType() == CT_FUNC_DEF
+      || pc->GetParentType() == CT_ENUM
+      || pc->GetFlags().test_any(PCF_IN_ENUM | PCF_IN_STRUCT)
+      || pc->IsString(":")
+      || pc->IsString("+")
+      || pc->IsString("-"))
    {
       return(true);
    }
@@ -173,7 +166,7 @@ static bool pawn_continued(Chunk *pc, size_t br_level)
 } // pawn_continued
 
 
-void pawn_prescan(void)
+void pawn_prescan()
 {
    LOG_FUNC_ENTRY();
 
@@ -188,9 +181,9 @@ void pawn_prescan(void)
          && pc->IsNotNullChunk())
    {
       if (  did_nl
-         && pc->type != CT_PREPROC
-         && !chunk_is_newline(pc)
-         && pc->level == 0)
+         && pc->IsNot(CT_PREPROC)
+         && !pc->IsNewline()
+         && pc->GetLevel() == 0)
       {
          // pc now points to the start of a line
          pc = pawn_process_line(pc);
@@ -200,7 +193,7 @@ void pawn_prescan(void)
       if (  pc != nullptr
          && pc->IsNotNullChunk())
       {
-         did_nl = (chunk_is_token(pc, CT_NEWLINE));
+         did_nl = (pc->Is(CT_NEWLINE));
       }
       pc = pc->GetNextNc();
    }
@@ -212,36 +205,31 @@ static Chunk *pawn_process_line(Chunk *start)
    LOG_FUNC_ENTRY();
 
    //LOG_FMT(LSYS, "%s: %d - %s\n", __func__,
-   //        start->orig_line, start->Text());
+   //        start->GetOrigLine(), start->Text());
 
-   if (  chunk_is_token(start, CT_NEW)
-      || chunk_is_str(start, "const"))
+   if (  start->Is(CT_NEW)
+      || start->IsString("const"))
    {
       return(pawn_process_variable(start));
    }
    // if a open paren is found before an assign, then this is a function
    Chunk *fcn = nullptr;
 
-   if (chunk_is_token(start, CT_WORD))
+   if (start->Is(CT_WORD))
    {
       fcn = start;
    }
-   Chunk *pc = Chunk::NullChunkPtr;
-
-   if (start != nullptr)
-   {
-      pc = start;
-   }
+   Chunk *pc = start;
 
    while (  ((pc = pc->GetNextNc())->IsNotNullChunk())
-         && !chunk_is_str(pc, "(")
-         && pc->type != CT_ASSIGN
-         && pc->type != CT_NEWLINE)
+         && !pc->IsString("(")
+         && pc->IsNot(CT_ASSIGN)
+         && pc->IsNot(CT_NEWLINE))
    {
-      if (  pc->level == 0
-         && (  chunk_is_token(pc, CT_FUNCTION)
-            || chunk_is_token(pc, CT_WORD)
-            || chunk_is_token(pc, CT_OPERATOR_VAL)))
+      if (  pc->GetLevel() == 0
+         && (  pc->Is(CT_FUNCTION)
+            || pc->Is(CT_WORD)
+            || pc->Is(CT_OPERATOR_VAL)))
       {
          fcn = pc;
       }
@@ -249,7 +237,7 @@ static Chunk *pawn_process_line(Chunk *start)
 
    if (pc->IsNotNullChunk())
    {
-      if (chunk_is_token(pc, CT_ASSIGN))
+      if (pc->Is(CT_ASSIGN))
       {
          return(pawn_process_variable(pc));
       }
@@ -261,13 +249,13 @@ static Chunk *pawn_process_line(Chunk *start)
       return(pawn_mark_function0(start, fcn));
    }
 
-   if (chunk_is_token(start, CT_ENUM))
+   if (start->Is(CT_ENUM))
    {
-      pc = start->GetNextType(CT_BRACE_CLOSE, start->level);
+      pc = start->GetNextType(CT_BRACE_CLOSE, start->GetLevel());
       return(pc);
    }
    //LOG_FMT(LSYS, "%s: Don't understand line %d, starting with '%s' [%s]\n",
-   //        __func__, start->orig_line, start->Text(), get_token_name(start->type));
+   //        __func__, start->GetOrigLine(), start->Text(), get_token_name(start->GetType()));
    return(start);
 } // pawn_process_line
 
@@ -277,7 +265,8 @@ static Chunk *pawn_process_variable(Chunk *start)
    LOG_FUNC_ENTRY();
    Chunk *pc = Chunk::NullChunkPtr;
 
-   if (start != nullptr)
+   if (  start != nullptr
+      && start->IsNotNullChunk())
    {
       pc = start;
    }
@@ -285,12 +274,11 @@ static Chunk *pawn_process_variable(Chunk *start)
 
    while ((pc = pc->GetNextNc())->IsNotNullChunk())
    {
-      if (  chunk_is_token(pc, CT_NEWLINE)
+      if (  pc->Is(CT_NEWLINE)
          && prev->IsNotNullChunk()
-         && !pawn_continued(prev, start->level))
+         && !pawn_continued(prev, start->GetLevel()))
       {
-         if (  prev->type != CT_VSEMICOLON
-            && prev->type != CT_SEMICOLON)
+         if (!prev->IsSemicolon())
          {
             pawn_add_vsemi_after(prev);
          }
@@ -302,7 +290,7 @@ static Chunk *pawn_process_variable(Chunk *start)
 }
 
 
-void pawn_add_virtual_semicolons(void)
+void pawn_add_virtual_semicolons()
 {
    LOG_FUNC_ENTRY();
 
@@ -314,28 +302,24 @@ void pawn_add_virtual_semicolons(void)
 
       while ((pc = pc->GetNext())->IsNotNullChunk())
       {
-         if (  !pc->IsComment()
-            && !chunk_is_newline(pc)
-            && pc->type != CT_VBRACE_CLOSE
-            && pc->type != CT_VBRACE_OPEN)
+         if (  !pc->IsCommentOrNewline()
+            && !pc->IsVBrace())
          {
             prev = pc;
          }
 
          if (  prev->IsNullChunk()
-            || (  pc->type != CT_NEWLINE
-               && pc->type != CT_BRACE_CLOSE
-               && pc->type != CT_VBRACE_CLOSE))
+            || (  pc->IsNot(CT_NEWLINE)
+               && !pc->IsBraceClose()))
          {
             continue;
          }
 
          // we just hit a newline and we have a previous token
-         if (  !prev->flags.test(PCF_IN_PREPROC)
-            && !prev->flags.test_any(PCF_IN_ENUM | PCF_IN_STRUCT)
-            && prev->type != CT_VSEMICOLON
-            && prev->type != CT_SEMICOLON
-            && !pawn_continued(prev, prev->brace_level))
+         if (  !prev->TestFlags(PCF_IN_PREPROC)
+            && !prev->GetFlags().test_any(PCF_IN_ENUM | PCF_IN_STRUCT)
+            && !prev->IsSemicolon()
+            && !pawn_continued(prev, prev->GetBraceLevel()))
          {
             pawn_add_vsemi_after(prev);
             prev = Chunk::NullChunkPtr;
@@ -352,26 +336,26 @@ static Chunk *pawn_mark_function0(Chunk *start, Chunk *fcn)
    // handle prototypes
    if (start == fcn)
    {
-      Chunk *last = fcn->GetNextType(CT_PAREN_CLOSE, fcn->level)->GetNext();
+      Chunk *last = fcn->GetNextType(CT_PAREN_CLOSE, fcn->GetLevel())->GetNext();
 
-      if (chunk_is_token(last, CT_SEMICOLON))
+      if (last->Is(CT_SEMICOLON))
       {
          LOG_FMT(LPFUNC, "%s: %zu] '%s' proto due to semicolon\n",
-                 __func__, fcn->orig_line, fcn->Text());
-         set_chunk_type(fcn, CT_FUNC_PROTO);
+                 __func__, fcn->GetOrigLine(), fcn->Text());
+         fcn->SetType(CT_FUNC_PROTO);
          return(last);
       }
    }
    else
    {
-      if (  chunk_is_token(start, CT_FORWARD)
-         || chunk_is_token(start, CT_NATIVE))
+      if (  start->Is(CT_FORWARD)
+         || start->Is(CT_NATIVE))
       {
          LOG_FMT(LPFUNC, "%s: %zu] '%s' [%s] proto due to %s\n",
-                 __func__, fcn->orig_line, fcn->Text(),
-                 get_token_name(fcn->type),
-                 get_token_name(start->type));
-         set_chunk_type(fcn, CT_FUNC_PROTO);
+                 __func__, fcn->GetOrigLine(), fcn->Text(),
+                 get_token_name(fcn->GetType()),
+                 get_token_name(start->GetType()));
+         fcn->SetType(CT_FUNC_PROTO);
          return(fcn->GetNextNc());
       }
    }
@@ -385,10 +369,10 @@ static Chunk *pawn_process_func_def(Chunk *pc)
    LOG_FUNC_ENTRY();
 
    // We are on a function definition
-   set_chunk_type(pc, CT_FUNC_DEF);
+   pc->SetType(CT_FUNC_DEF);
 
    LOG_FMT(LPFUNC, "%s: %zu:%zu %s\n",
-           __func__, pc->orig_line, pc->orig_col, pc->Text());
+           __func__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
 
    /*
     * If we don't have a brace open right after the close fparen, then
@@ -400,21 +384,21 @@ static Chunk *pawn_process_func_def(Chunk *pc)
    if (last->IsNotNullChunk())
    {
       LOG_FMT(LPFUNC, "%s: %zu] last is '%s' [%s]\n",
-              __func__, last->orig_line, last->Text(), get_token_name(last->type));
+              __func__, last->GetOrigLine(), last->Text(), get_token_name(last->GetType()));
    }
 
    // See if there is a state clause after the function
    if (  last->IsNotNullChunk()
-      && chunk_is_str(last, "<"))
+      && last->IsString("<"))
    {
       LOG_FMT(LPFUNC, "%s: %zu] '%s' has state angle open %s\n",
-              __func__, pc->orig_line, pc->Text(), get_token_name(last->type));
+              __func__, pc->GetOrigLine(), pc->Text(), get_token_name(last->GetType()));
 
-      set_chunk_type(last, CT_ANGLE_OPEN);
-      set_chunk_parent(last, CT_FUNC_DEF);
+      last->SetType(CT_ANGLE_OPEN);
+      last->SetParentType(CT_FUNC_DEF);
 
       while (  ((last = last->GetNext())->IsNotNullChunk())
-            && !chunk_is_str(last, ">"))
+            && !last->IsString(">"))
       {
          // do nothing just search, TODO: use search_chunk
       }
@@ -422,9 +406,9 @@ static Chunk *pawn_process_func_def(Chunk *pc)
       if (last->IsNotNullChunk())
       {
          LOG_FMT(LPFUNC, "%s: %zu] '%s' has state angle close %s\n",
-                 __func__, pc->orig_line, pc->Text(), get_token_name(last->type));
-         set_chunk_type(last, CT_ANGLE_CLOSE);
-         set_chunk_parent(last, CT_FUNC_DEF);
+                 __func__, pc->GetOrigLine(), pc->Text(), get_token_name(last->GetType()));
+         last->SetType(CT_ANGLE_CLOSE);
+         last->SetParentType(CT_FUNC_DEF);
       }
       last = last->GetNextNcNnl();
    }
@@ -434,32 +418,32 @@ static Chunk *pawn_process_func_def(Chunk *pc)
       return(last);
    }
 
-   if (chunk_is_token(last, CT_BRACE_OPEN))
+   if (last->Is(CT_BRACE_OPEN))
    {
-      set_chunk_parent(last, CT_FUNC_DEF);
-      last = last->GetNextType(CT_BRACE_CLOSE, last->level);
+      last->SetParentType(CT_FUNC_DEF);
+      last = last->GetNextType(CT_BRACE_CLOSE, last->GetLevel());
 
       if (last->IsNotNullChunk())
       {
-         set_chunk_parent(last, CT_FUNC_DEF);
+         last->SetParentType(CT_FUNC_DEF);
       }
    }
    else
    {
       LOG_FMT(LPFUNC, "%s: %zu] '%s' fdef: expected brace open: %s\n",
-              __func__, pc->orig_line, pc->Text(), get_token_name(last->type));
+              __func__, pc->GetOrigLine(), pc->Text(), get_token_name(last->GetType()));
 
       // do not insert a vbrace before a preproc
-      if (last->flags.test(PCF_IN_PREPROC))
+      if (last->TestFlags(PCF_IN_PREPROC))
       {
          return(last);
       }
       Chunk chunk = *last;
-      chunk.str.clear();
-      set_chunk_type(&chunk, CT_VBRACE_OPEN);
-      set_chunk_parent(&chunk, CT_FUNC_DEF);
+      chunk.Str().clear();
+      chunk.SetType(CT_VBRACE_OPEN);
+      chunk.SetParentType(CT_FUNC_DEF);
 
-      Chunk *prev = chunk_add_before(&chunk, last);
+      Chunk *prev = chunk.CopyAndAddBefore(last);
       last = prev;
 
       // find the next newline at level 0
@@ -468,22 +452,22 @@ static Chunk *pawn_process_func_def(Chunk *pc)
       do
       {
          LOG_FMT(LPFUNC, "%s:%zu] check %s, level %zu\n",
-                 __func__, prev->orig_line, get_token_name(prev->type), prev->level);
+                 __func__, prev->GetOrigLine(), get_token_name(prev->GetType()), prev->GetLevel());
 
-         if (  chunk_is_token(prev, CT_NEWLINE)
-            && prev->level == 0)
+         if (  prev->Is(CT_NEWLINE)
+            && prev->GetLevel() == 0)
          {
             Chunk *next = prev->GetNextNcNnl();
 
             if (  next->IsNotNullChunk()
-               && next->type != CT_ELSE
-               && next->type != CT_WHILE_OF_DO)
+               && next->IsNot(CT_ELSE)
+               && next->IsNot(CT_WHILE_OF_DO))
             {
                break;
             }
          }
-         prev->level++;
-         prev->brace_level++;
+         prev->SetLevel(prev->GetLevel() + 1);
+         prev->SetBraceLevel(prev->GetBraceLevel() + 1);
          last = prev;
       } while ((prev = prev->GetNext())->IsNotNullChunk());
 
@@ -491,16 +475,16 @@ static Chunk *pawn_process_func_def(Chunk *pc)
          && last->IsNotNullChunk())
       {
          LOG_FMT(LPFUNC, "%s:%zu] ended on %s, level %zu\n",
-                 __func__, last->orig_line, get_token_name(last->type), last->level);
+                 __func__, last->GetOrigLine(), get_token_name(last->GetType()), last->GetLevel());
       }
       chunk = *last;
-      chunk.str.clear();
-      set_chunk_type(&chunk, CT_VBRACE_CLOSE);
-      set_chunk_parent(&chunk, CT_FUNC_DEF);
-      chunk.column     += last->Len();
-      chunk.level       = 0;
-      chunk.brace_level = 0;
-      last              = chunk_add_after(&chunk, last);
+      chunk.Str().clear();
+      chunk.SetType(CT_VBRACE_CLOSE);
+      chunk.SetParentType(CT_FUNC_DEF);
+      chunk.SetColumn(chunk.GetColumn() + last->Len());
+      chunk.SetLevel(0);
+      chunk.SetBraceLevel(0);
+      last = chunk.CopyAndAddAfter(last);
    }
    return(last);
 } // pawn_process_func_def
@@ -511,14 +495,14 @@ Chunk *pawn_check_vsemicolon(Chunk *pc)
    LOG_FUNC_ENTRY();
 
    // Grab the open VBrace
-   Chunk *vb_open = pc->GetPrevType(CT_VBRACE_OPEN, -1);
+   Chunk *vb_open = pc->GetPrevType(CT_VBRACE_OPEN);
 
    /*
     * Grab the item before the newline
     * Don't do anything if:
     *  - the only thing previous is the V-Brace open
     *  - in a preprocessor
-    *  - level > (vb_open->level + 1) -- ie, in () or []
+    *  - level > (vb_open->GetLevel() + 1) -- ie, in () or []
     *  - it is something that needs a continuation
     *    + arith, assign, bool, comma, compare
     */
@@ -526,13 +510,13 @@ Chunk *pawn_check_vsemicolon(Chunk *pc)
 
    if (  prev->IsNullChunk()
       || prev == vb_open
-      || prev->flags.test(PCF_IN_PREPROC)
-      || pawn_continued(prev, vb_open->level + 1))
+      || prev->TestFlags(PCF_IN_PREPROC)
+      || pawn_continued(prev, vb_open->GetLevel() + 1))
    {
       if (prev->IsNotNullChunk())
       {
          LOG_FMT(LPVSEMI, "%s:  no  VSEMI on line %zu, prev='%s' [%s]\n",
-                 __func__, prev->orig_line, prev->Text(), get_token_name(prev->type));
+                 __func__, prev->GetOrigLine(), prev->Text(), get_token_name(prev->GetType()));
       }
       return(pc);
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.h
index 9e2d7832..03766a08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.h
@@ -18,10 +18,10 @@
  *
  * We are looking for unbraced functions.
  */
-void pawn_prescan(void);
+void pawn_prescan();
 
 
-void pawn_add_virtual_semicolons(void);
+void pawn_add_virtual_semicolons();
 
 
 /**
@@ -39,7 +39,7 @@ Chunk *pawn_check_vsemicolon(Chunk *pc);
  * Turns certain virtual semicolons invisible.
  *  - after a close brace with a parent of switch, case, else, if
  */
-void pawn_scrub_vsemi(void);
+void pawn_scrub_vsemi();
 
 
 //! add a semicolon after ...
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.cpp
index 77e577f4..77e577f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.h
index 5f57c3f1..5f57c3f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_levels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_levels.h
index d809514a..266e1981 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_levels.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_levels.h
@@ -33,7 +33,7 @@ enum log_sev_t
    LERR      = 1,   //! error messages
    LWARN     = 2,   //! warnings
    LNOTE     = 3,   //! user notifications
-   LINFO     = 4,   //! user informations
+   LINFO     = 4,   //! user information
    LDATA     = 5,   //! data logging
 
    LFILELIST = 8,   //! Files in the file list file
@@ -61,7 +61,7 @@ enum log_sev_t
    LCMTIND   = 30,  //! Comment Indent
    LINDLINE  = 31,  //! indent line
    LSIB      = 32,  //! Scan IB
-   LRETURN   = 33,  //! add/remove parens for return
+   LRETURN   = 33,  //! add/remove parens for return or throw
    LBRDEL    = 34,  //! brace removal
    LFCN      = 35,  //! function detection
    LFCNP     = 36,  //! function parameters
@@ -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,  //! set_chunk_parent()
-   LSETTYP   = 92,  //! set_chunk_type()
+   LSETPAR   = 91,  //! Chunk::SetParentTypeReal()
+   LSETTYP   = 92,  //! Chunk::SetTypeReal()
    LSETFLG   = 93,  //! set_chunk_flags()
    LNLFUNCT  = 94,  //! newlines before function
    LCHUNK    = 95,  //! Add or delete chunk
@@ -132,6 +132,7 @@ enum log_sev_t
    LOUTPUT   = 101, //! output
    LUNC      = 102, //! rules used in uncrustify.cpp
    LQT       = 103, //! load/save options for Qt
+   LVARDFBLK = 104, //! newlines for variable definition blocks
    LOTHER    = 255, //! stuff that doesn't neatly fit any other category
 };
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.cpp
new file mode 100644
index 00000000..ec5f6240
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.cpp
@@ -0,0 +1,106 @@
+/**
+ * @file log_rules.cpp
+ * is an extract from space.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "log_rules.h"
+
+#include "unc_tools.h"
+
+
+void log_rule2(const char *func, size_t line, const char *rule, Chunk *first, Chunk *second)
+{
+   LOG_FUNC_ENTRY();
+
+   if (second->IsNot(CT_NEWLINE))
+   {
+      LOG_FMT(LSPACE, "%s(%zu): first orig line is %zu, orig col is %zu, Text() is '%s', [%s/%s] <===>\n",
+              func, line, first->GetOrigLine(), first->GetOrigCol(), first->Text(),
+              get_token_name(first->GetType()), get_token_name(first->GetParentType()));
+      LOG_FMT(LSPACE, "           second orig line is %zu, orig col is %zu, Text() is '%s', [%s/%s] :",
+              second->GetOrigLine(), second->GetOrigCol(), second->Text(),
+              get_token_name(second->GetType()), get_token_name(second->GetParentType()));
+      LOG_FMT(LSPACE, " rule %s[line %zu]\n",
+              rule, line);
+   }
+}
+
+
+#ifdef SUPER_LOG
+
+
+void log_rule3(log_sev_t sev, const char *func, size_t line, const char *rule)
+#else
+
+
+void log_rule3(log_sev_t sev, const char *func, const char *rule)
+#endif
+{
+   // some Windows platforms provide a qualified function name ("ABC::XYZ::function_Name")
+   // as __func__; call get_unqualified_func_name() to return an unqualified function name
+
+   func = get_unqualified_func_name(func);
+
+#ifdef SUPER_LOG
+   LOG_FMT(sev, "log_rule(%s:%zu): rule is '%s'\n", func, line, rule);
+#else
+   LOG_FMT(sev, "log_rule(%s): rule is '%s'\n", func, rule);
+#endif
+}
+
+
+void log_rule4(const char *rule, Chunk *first)
+{
+   if (!(cpd.html_type == tracking_type_e::TT_SPACE))
+   {
+      return;
+   }
+
+   if (first->GetTrackingData() == nullptr)
+   {
+      first->TrackingData() = new track_list;
+   }
+   // copy the rule
+   size_t length = strlen(rule) + 1;
+   char   *r     = (char *)malloc(length);
+
+   strcpy(r, rule);
+   size_t   a_number = get_A_Number();
+   Track_nr A        = make_pair(a_number, r);
+
+   first->TrackingData()->push_back(A);
+   size_t sizeOfTrack = first->GetTrackingData()->size();
+
+   LOG_FMT(LSPACE, "log_rule4(%d): rule is '%s', after '%s', at line %zu, tracking number is %zu, size is %zu\n",
+           __LINE__, rule, first->Text(), first->GetOrigLine(), a_number, sizeOfTrack);
+}
+
+
+void log_ruleNL(const char *rule, Chunk *pc)
+{
+   if (!(cpd.html_type == tracking_type_e::TT_NEWLINE))
+   {
+      return;
+   }
+
+   if (pc->GetTrackingData() == nullptr)
+   {
+      pc->TrackingData() = new track_list;
+   }
+   // 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);
+
+   pc->TrackingData()->push_back(A);
+   size_t sizeOfTrack = pc->GetTrackingData()->size();
+
+   LOG_FMT(LSPACE, "log_rule4(%d): rule is '%s', after '%s', at line %zu, tracking number is %zu, size is %zu\n",
+           __LINE__, rule, pc->Text(), pc->GetOrigLine(), a_number, sizeOfTrack);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.h
index e7916702..02345a25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.h
@@ -23,7 +23,7 @@ using namespace uncrustify;
    log_rule2(__func__, __LINE__, (rule), first, second)
 #endif
 
-// if you need more debug informations, remove the comment at the next line
+// if you need more debug information, remove the comment at the next line
 #define SUPER_LOG    1
 #ifdef SUPER_LOG
 #define log_rule_B(rule) \
@@ -33,6 +33,14 @@ using namespace uncrustify;
    log_rule3(LCURRENT, __func__, (rule))
 #endif
 
+#ifdef SUPER_LOG
+#define log_rule_NL(rule) \
+   log_ruleNL((rule), pc)
+#else
+#define log_rule_NL(rule) \
+   log_ruleNL(LCURRENT, __func__, (rule))
+#endif
+
 void log_rule2(const char *func, size_t line, const char *rule, Chunk *first, Chunk *second);
 
 
@@ -46,4 +54,6 @@ void log_rule3(log_sev_t sev, const char *func, const char *rule);
 
 void log_rule4(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.75.0/src/logger.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.cpp
index 969a4192..c9a50682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logger.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.cpp
@@ -71,7 +71,7 @@ static size_t log_start(log_sev_t sev);
  * Cleans up after a log statement by detecting whether the log is done,
  * (it ends in a newline) and possibly flushing the log.
  */
-static void log_end(void);
+static void log_end();
 
 
 /**
@@ -167,7 +167,7 @@ static size_t log_start(log_sev_t sev)
 }
 
 
-static void log_end(void)
+static void log_end()
 {
    g_log.in_log = (g_log.bufX[g_log.buf_len - 1] != '\n');
 
@@ -201,7 +201,7 @@ void log_fmt(log_sev_t sev, const char *fmt, ...)
 
    if (length >= buffer_length)
    {
-      fprintf(stderr, "FATAL(1): The variable 'buf' is not big enought:\n");
+      fprintf(stderr, "FATAL(1): The variable 'buf' is not big enough:\n");
       fprintf(stderr, "   it should be bigger as %u\n", length);
       fprintf(stderr, "Please make a report.\n");
       fprintf(stderr, "For the buffer: %s\n", fmt);
@@ -243,7 +243,7 @@ void log_fmt(log_sev_t sev, const char *fmt, ...)
 
             if (X >= buffer_length)
             {
-               fprintf(stderr, "FATAL(2): The variable 'buf' is not big enought:\n");
+               fprintf(stderr, "FATAL(2): The variable 'buf' is not big enough:\n");
                fprintf(stderr, "   it should be bigger as %zu\n", X);
                fprintf(stderr, "Please make a report.\n");
                fprintf(stderr, "For the buffer: %s\n", fmt);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logger.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.h
index 68501967..9b27fbab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logger.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.h
@@ -120,6 +120,24 @@ void log_flush(bool force_nl);
 #define __unqualified_func__    get_unqualified_func_name(__func__)
 
 
+#define LOG_CHUNK(sev, pc_current)                                                                                                                                                             \
+   if (pc_current->Is(CT_NEWLINE))                                                                                                                                                             \
+   {                                                                                                                                                                                           \
+      LOG_FMT(sev, "%s(%d): orig line is %zu, orig col is %zu, <Newline>, PRE is %s\n",                                                                                                        \
+              __func__, __LINE__, pc_current->GetOrigLine(), pc_current->GetOrigCol(), pc_current->IsPreproc() ? "true" : "false");                                                            \
+   }                                                                                                                                                                                           \
+   else if (pc_current->Is(CT_NL_CONT))                                                                                                                                                        \
+   {                                                                                                                                                                                           \
+      LOG_FMT(sev, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s, PRE is %s\n",                                                                                          \
+              __func__, __LINE__, pc_current->GetOrigLine(), pc_current->GetOrigCol(), pc_current->Text(), get_token_name(pc_current->GetType()), pc_current->IsPreproc() ? "true" : "false"); \
+   }                                                                                                                                                                                           \
+   else                                                                                                                                                                                        \
+   {                                                                                                                                                                                           \
+      LOG_FMT(sev, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s, PRE is %s\n",                                                                                          \
+              __func__, __LINE__, pc_current->GetOrigLine(), pc_current->GetOrigCol(), pc_current->Text(), get_token_name(pc_current->GetType()), pc_current->IsPreproc() ? "true" : "false"); \
+   }
+
+
 #ifdef DEBUG
 /**
  * This should be called as the first thing in a function.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.cpp
index ca94cd05..148ce193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.cpp
@@ -20,8 +20,8 @@
 /*
  * the test suite Coveralls: https://coveralls.io
  * will complains because these functions are only
- * used at developement time.
- * Don't worry about unsed lines for the functions:
+ * used at development time.
+ * Don't worry about unused lines for the functions:
  *   logmask_to_str
  */
 char *logmask_to_str(const log_mask_t &mask, char *buf, int size)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.h
index 7cc24ca4..ef00e1d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.h
@@ -18,8 +18,8 @@
 /*
  * the test suite Coveralls: https://coveralls.io
  * will complains because these functions are only
- * used at developement time.
- * Don't worry about unsed lines for the functions:
+ * used at development time.
+ * Don't worry about unused lines for the functions:
  *   logmask_test
  *   logmask_set_all
  */
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
new file mode 100644
index 00000000..cd058697
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.cpp
@@ -0,0 +1,112 @@
+/**
+ * @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/src/mark_question_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.h
new file mode 100644
index 00000000..20fca294
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.h
@@ -0,0 +1,13 @@
+/**
+ * @file mark_question_colon.h
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#ifndef MARK_QUESTION_COLON_H_INCLUDED
+#define MARK_QUESTION_COLON_H_INCLUDED
+
+void mark_question_colon();
+
+#endif /* MARK_QUESTION_COLON_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.cpp
index af8874a4..af8874a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.h
index d1148b5e..d1148b5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.cpp
index 1b4f09b5..ca24e941 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.cpp
@@ -2,7 +2,7 @@
  * @file newlines.cpp
  * Adds or removes newlines.
  *
- * Informations
+ * Information
  *   "Ignore" means do not change it.
  *   "Add" in the context of spaces means make sure there is at least 1.
  *   "Add" elsewhere means make sure one is present.
@@ -109,6 +109,11 @@ static bool is_class_one_liner(Chunk *pc);
  */
 bool is_func_proto_group(Chunk *pc, E_Token one_liner_type);
 
+/**
+ * Test if an opening brace is part of a function call or definition.
+ */
+static bool is_func_call_or_def(Chunk *pc);
+
 
 //! Find the next newline or nl_cont
 static void nl_handle_define(Chunk *pc);
@@ -245,7 +250,7 @@ static bool is_var_def(Chunk *pc, Chunk *next);
 
 
 //! Put newline(s) before and/or after a block of variable definitions
-static Chunk *newline_def_blk(Chunk *start, bool fn_top);
+static Chunk *newline_var_def_blk(Chunk *start);
 
 
 /**
@@ -332,54 +337,54 @@ static bool can_increase_nl(Chunk *nl)
    {
       log_rule_B("nl_squeeze_ifdef");
 
-      Chunk *pp_start = chunk_get_pp_start(prev);
+      Chunk *pp_start = prev->GetPpStart();
 
-      if (  pp_start != nullptr
-         && (  get_chunk_parent_type(pp_start) == CT_PP_IF
-            || get_chunk_parent_type(pp_start) == CT_PP_ELSE)
-         && (  pp_start->level > 0
+      if (  pp_start->IsNotNullChunk()
+         && (  pp_start->GetParentType() == CT_PP_IF
+            || pp_start->GetParentType() == CT_PP_ELSE)
+         && (  pp_start->GetLevel() > 0
             || options::nl_squeeze_ifdef_top_level()))
       {
          log_rule_B("nl_squeeze_ifdef_top_level");
-         bool rv = ifdef_over_whole_file() && pp_start->flags.test(PCF_WF_IF);
+         bool rv = ifdef_over_whole_file() && pp_start->TestFlags(PCF_WF_IF);
          LOG_FMT(LBLANKD, "%s(%d): nl_squeeze_ifdef %zu (prev) pp_lvl=%zu rv=%d\n",
-                 __func__, __LINE__, nl->orig_line, nl->pp_level, rv);
+                 __func__, __LINE__, nl->GetOrigLine(), nl->GetPpLevel(), rv);
          return(rv);
       }
 
-      if (  chunk_is_token(next, CT_PREPROC)
-         && (  get_chunk_parent_type(next) == CT_PP_ELSE
-            || get_chunk_parent_type(next) == CT_PP_ENDIF)
-         && (  next->level > 0
+      if (  next->Is(CT_PREPROC)
+         && (  next->GetParentType() == CT_PP_ELSE
+            || next->GetParentType() == CT_PP_ENDIF)
+         && (  next->GetLevel() > 0
             || options::nl_squeeze_ifdef_top_level()))
       {
          log_rule_B("nl_squeeze_ifdef_top_level");
-         bool rv = ifdef_over_whole_file() && next->flags.test(PCF_WF_ENDIF);
+         bool rv = ifdef_over_whole_file() && next->TestFlags(PCF_WF_ENDIF);
          LOG_FMT(LBLANKD, "%s(%d): nl_squeeze_ifdef %zu (next) pp_lvl=%zu rv=%d\n",
-                 __func__, __LINE__, nl->orig_line, nl->pp_level, rv);
+                 __func__, __LINE__, nl->GetOrigLine(), nl->GetPpLevel(), rv);
          return(rv);
       }
    }
 
-   if (chunk_is_token(next, CT_BRACE_CLOSE))
+   if (next->Is(CT_BRACE_CLOSE))
    {
       if (  options::nl_inside_namespace() > 0
-         && get_chunk_parent_type(next) == CT_NAMESPACE)
+         && next->GetParentType() == CT_NAMESPACE)
       {
          log_rule_B("nl_inside_namespace");
          LOG_FMT(LBLANKD, "%s(%d): nl_inside_namespace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
+                 __func__, __LINE__, nl->GetOrigLine());
          return(true);
       }
 
       if (  options::nl_inside_empty_func() > 0
-         && chunk_is_token(prev, CT_BRACE_OPEN)
-         && (  get_chunk_parent_type(next) == CT_FUNC_DEF
-            || get_chunk_parent_type(next) == CT_FUNC_CLASS_DEF))
+         && prev->Is(CT_BRACE_OPEN)
+         && (  next->GetParentType() == CT_FUNC_DEF
+            || next->GetParentType() == CT_FUNC_CLASS_DEF))
       {
          log_rule_B("nl_inside_empty_func");
          LOG_FMT(LBLANKD, "%s(%d): nl_inside_empty_func %zu\n",
-                 __func__, __LINE__, nl->orig_line);
+                 __func__, __LINE__, nl->GetOrigLine());
          return(true);
       }
 
@@ -387,42 +392,42 @@ static bool can_increase_nl(Chunk *nl)
       {
          log_rule_B("eat_blanks_before_close_brace");
          LOG_FMT(LBLANKD, "%s(%d): eat_blanks_before_close_brace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
+                 __func__, __LINE__, nl->GetOrigLine());
          return(false);
       }
    }
 
-   if (chunk_is_token(prev, CT_BRACE_CLOSE))
+   if (prev->Is(CT_BRACE_CLOSE))
    {
       if (  options::nl_before_namespace()
-         && get_chunk_parent_type(prev) == CT_NAMESPACE)
+         && prev->GetParentType() == CT_NAMESPACE)
       {
          log_rule_B("nl_before_namespace");
          LOG_FMT(LBLANKD, "%s(%d): nl_before_namespace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
+                 __func__, __LINE__, nl->GetOrigLine());
          return(true);
       }
    }
 
-   if (chunk_is_token(prev, CT_BRACE_OPEN))
+   if (prev->Is(CT_BRACE_OPEN))
    {
       if (  options::nl_inside_namespace() > 0
-         && get_chunk_parent_type(prev) == CT_NAMESPACE)
+         && prev->GetParentType() == CT_NAMESPACE)
       {
          log_rule_B("nl_inside_namespace");
          LOG_FMT(LBLANKD, "%s(%d): nl_inside_namespace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
+                 __func__, __LINE__, nl->GetOrigLine());
          return(true);
       }
 
       if (  options::nl_inside_empty_func() > 0
-         && chunk_is_token(next, CT_BRACE_CLOSE)
-         && (  get_chunk_parent_type(prev) == CT_FUNC_DEF
-            || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF))
+         && next->Is(CT_BRACE_CLOSE)
+         && (  prev->GetParentType() == CT_FUNC_DEF
+            || prev->GetParentType() == CT_FUNC_CLASS_DEF))
       {
          log_rule_B("nl_inside_empty_func");
          LOG_FMT(LBLANKD, "%s(%d): nl_inside_empty_func %zu\n",
-                 __func__, __LINE__, nl->orig_line);
+                 __func__, __LINE__, nl->GetOrigLine());
          return(true);
       }
 
@@ -430,7 +435,7 @@ static bool can_increase_nl(Chunk *nl)
       {
          log_rule_B("eat_blanks_after_open_brace");
          LOG_FMT(LBLANKD, "%s(%d): eat_blanks_after_open_brace %zu\n",
-                 __func__, __LINE__, nl->orig_line);
+                 __func__, __LINE__, nl->GetOrigLine());
          return(false);
       }
    }
@@ -439,7 +444,7 @@ static bool can_increase_nl(Chunk *nl)
    if (  !pcmt
       && (options::nl_start_of_file() != IARF_IGNORE))
    {
-      LOG_FMT(LBLANKD, "%s(%d): SOF no prev %zu\n", __func__, __LINE__, nl->orig_line);
+      LOG_FMT(LBLANKD, "%s(%d): SOF no prev %zu\n", __func__, __LINE__, nl->GetOrigLine());
       return(false);
    }
    log_rule_B("nl_end_of_file");
@@ -447,7 +452,7 @@ static bool can_increase_nl(Chunk *nl)
    if (  next->IsNullChunk()
       && (options::nl_end_of_file() != IARF_IGNORE))
    {
-      LOG_FMT(LBLANKD, "%s(%d): EOF no next %zu\n", __func__, __LINE__, nl->orig_line);
+      LOG_FMT(LBLANKD, "%s(%d): EOF no next %zu\n", __func__, __LINE__, nl->GetOrigLine());
       return(false);
    }
    return(true);
@@ -466,31 +471,31 @@ static void setup_newline_add(Chunk *prev, Chunk *nl, Chunk *next)
    }
    undo_one_liner(prev);
 
-   nl->orig_line   = prev->orig_line;
-   nl->level       = prev->level;
-   nl->pp_level    = prev->pp_level;
-   nl->brace_level = prev->brace_level;
-   nl->pp_level    = prev->pp_level;
-   nl->nl_count    = 1;
-   nl->flags       = (prev->flags & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC;
-   nl->orig_col    = prev->orig_col_end;
-   nl->column      = prev->orig_col;
+   nl->SetOrigLine(prev->GetOrigLine());
+   nl->SetLevel(prev->GetLevel());
+   nl->SetPpLevel(prev->GetPpLevel());
+   nl->SetBraceLevel(prev->GetBraceLevel());
+   nl->SetPpLevel(prev->GetPpLevel());
+   nl->SetNlCount(1);
+   nl->SetFlags((prev->GetFlags() & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC);
+   nl->SetOrigCol(prev->GetOrigColEnd());
+   nl->SetColumn(prev->GetOrigCol());
 
-   if (  prev->flags.test(PCF_IN_PREPROC)
-      && next->flags.test(PCF_IN_PREPROC))
+   if (  prev->TestFlags(PCF_IN_PREPROC)
+      && next->TestFlags(PCF_IN_PREPROC))
    {
-      chunk_flags_set(nl, PCF_IN_PREPROC);
+      nl->SetFlagBits(PCF_IN_PREPROC);
    }
 
-   if (nl->flags.test(PCF_IN_PREPROC))
+   if (nl->TestFlags(PCF_IN_PREPROC))
    {
-      set_chunk_type(nl, CT_NL_CONT);
-      nl->str = "\\\n";
+      nl->SetType(CT_NL_CONT);
+      nl->Str() = "\\\n";
    }
    else
    {
-      set_chunk_type(nl, CT_NEWLINE);
-      nl->str = "\n";
+      nl->SetType(CT_NEWLINE);
+      nl->Str() = "\n";
    }
 } // setup_newline_add
 
@@ -512,7 +517,7 @@ void double_newline(Chunk *nl)
    }
    LOG_FMT(LNEWLINE, "%s(%d): add newline after ", __func__, __LINE__);
 
-   if (chunk_is_token(prev, CT_VBRACE_CLOSE))
+   if (prev->Is(CT_VBRACE_CLOSE))
    {
       LOG_FMT(LNEWLINE, "VBRACE_CLOSE ");
    }
@@ -520,7 +525,7 @@ void double_newline(Chunk *nl)
    {
       LOG_FMT(LNEWLINE, "'%s' ", prev->Text());
    }
-   LOG_FMT(LNEWLINE, "on line %zu", prev->orig_line);
+   LOG_FMT(LNEWLINE, "on line %zu", prev->GetOrigLine());
 
    if (!can_increase_nl(nl))
    {
@@ -529,9 +534,9 @@ void double_newline(Chunk *nl)
    }
    LOG_FMT(LNEWLINE, " - done\n");
 
-   if (nl->nl_count != 2)
+   if (nl->GetNlCount() != 2)
    {
-      nl->nl_count = 2;
+      nl->SetNlCount(2);
       MARK_CHANGE();
    }
 } // double_newline
@@ -544,23 +549,23 @@ Chunk *newline_add_before(Chunk *pc)
    Chunk nl;
    Chunk *prev = pc->GetPrevNvb();
 
-   if (chunk_is_newline(prev))
+   if (prev->IsNewline())
    {
       // Already has a newline before this chunk
       return(prev);
    }
-   LOG_FMT(LNEWLINE, "%s(%d): Text() '%s', on orig_line is %zu, orig_col is %zu, pc->column is %zu",
-           __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->column);
+   LOG_FMT(LNEWLINE, "%s(%d): Text() '%s', on orig line is %zu, orig col is %zu, pc column is %zu",
+           __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetColumn());
    log_func_stack_inline(LNEWLINE);
 
    setup_newline_add(prev, &nl, pc);
-   nl.orig_col = pc->orig_col;
-   nl.pp_level = pc->pp_level;
-   LOG_FMT(LNEWLINE, "%s(%d): nl.column is %zu\n",
-           __func__, __LINE__, nl.column);
+   nl.SetOrigCol(pc->GetOrigCol());
+   nl.SetPpLevel(pc->GetPpLevel());
+   LOG_FMT(LNEWLINE, "%s(%d): nl column is %zu\n",
+           __func__, __LINE__, nl.GetColumn());
 
    MARK_CHANGE();
-   return(chunk_add_before(&nl, pc));
+   return(nl.CopyAndAddBefore(pc));
 } // newline_add_before
 
 
@@ -571,9 +576,9 @@ Chunk *newline_force_before(Chunk *pc)
    Chunk *nl = newline_add_before(pc);
 
    if (  nl->IsNotNullChunk()
-      && nl->nl_count > 1)
+      && nl->GetNlCount() > 1)
    {
-      nl->nl_count = 1;
+      nl->SetNlCount(1);
       MARK_CHANGE();
    }
    return(nl);
@@ -590,26 +595,26 @@ Chunk *newline_add_after(Chunk *pc)
    }
    Chunk *next = pc->GetNextNvb();
 
-   if (chunk_is_newline(next))
+   if (next->IsNewline())
    {
       // Already has a newline after this chunk
       return(next);
    }
    LOG_FMT(LNEWLINE, "%s(%d): '%s' on line %zu",
-           __func__, __LINE__, pc->Text(), pc->orig_line);
+           __func__, __LINE__, pc->Text(), pc->GetOrigLine());
    log_func_stack_inline(LNEWLINE);
 
    Chunk nl;
 
-   nl.orig_line = pc->orig_line;
-   nl.orig_col  = pc->orig_col;
+   nl.SetOrigLine(pc->GetOrigLine());
+   nl.SetOrigCol(pc->GetOrigCol());
    setup_newline_add(pc, &nl, next);
 
    MARK_CHANGE();
    // TO DO: check why the next statement is necessary
-   nl.orig_col = pc->orig_col;
-   nl.pp_level = pc->pp_level;
-   return(chunk_add_after(&nl, pc));
+   nl.SetOrigCol(pc->GetOrigCol());
+   nl.SetPpLevel(pc->GetPpLevel());
+   return(nl.CopyAndAddAfter(pc));
 } // newline_add_after
 
 
@@ -620,9 +625,9 @@ Chunk *newline_force_after(Chunk *pc)
    Chunk *nl = newline_add_after(pc);   // add a newline
 
    if (  nl->IsNotNullChunk()
-      && nl->nl_count > 1) // check if there are more than 1 newline
+      && nl->GetNlCount() > 1) // check if there are more than 1 newline
    {
-      nl->nl_count = 1;                   // if so change the newline count back to 1
+      nl->SetNlCount(1);                   // if so change the newline count back to 1
       MARK_CHANGE();
    }
    return(nl);
@@ -636,46 +641,45 @@ static void newline_end_newline(Chunk *br_close)
    Chunk *next = br_close->GetNext();
    Chunk nl;
 
-   if (  !chunk_is_newline(next)
-      && !next->IsComment())
+   if (!next->IsCommentOrNewline())
    {
-      nl.orig_line = br_close->orig_line;
-      nl.orig_col  = br_close->orig_col;
-      nl.nl_count  = 1;
-      nl.pp_level  = 0;
-      nl.flags     = (br_close->flags & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC;
+      nl.SetOrigLine(br_close->GetOrigLine());
+      nl.SetOrigCol(br_close->GetOrigCol());
+      nl.SetNlCount(1);
+      nl.SetPpLevel(0);
+      nl.SetFlags((br_close->GetFlags() & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC);
 
-      if (  br_close->flags.test(PCF_IN_PREPROC)
+      if (  br_close->TestFlags(PCF_IN_PREPROC)
          && next->IsNotNullChunk()
-         && next->flags.test(PCF_IN_PREPROC))
+         && next->TestFlags(PCF_IN_PREPROC))
       {
-         nl.flags |= PCF_IN_PREPROC;
+         nl.SetFlagBits(PCF_IN_PREPROC);
       }
 
-      if (nl.flags.test(PCF_IN_PREPROC))
+      if (nl.TestFlags(PCF_IN_PREPROC))
       {
-         set_chunk_type(&nl, CT_NL_CONT);
-         nl.str = "\\\n";
+         nl.SetType(CT_NL_CONT);
+         nl.Str() = "\\\n";
       }
       else
       {
-         set_chunk_type(&nl, CT_NEWLINE);
-         nl.str = "\n";
+         nl.SetType(CT_NEWLINE);
+         nl.Str() = "\n";
       }
       MARK_CHANGE();
       LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline after '%s'\n",
-              __func__, __LINE__, br_close->orig_line, br_close->orig_col, br_close->Text());
-      chunk_add_after(&nl, br_close);
+              __func__, __LINE__, br_close->GetOrigLine(), br_close->GetOrigCol(), br_close->Text());
+      nl.CopyAndAddAfter(br_close);
    }
 } // newline_end_newline
 
 
-static void newline_min_after(Chunk *ref, size_t count, pcf_flag_e flag)
+static void newline_min_after(Chunk *ref, size_t count, E_PcfFlag flag)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LNEWLINE, "%s(%d): for '%s', at orig_line %zu, count is %zu,\n   flag is %s:",
-           __func__, __LINE__, ref->Text(), ref->orig_line, count,
+   LOG_FMT(LNEWLINE, "%s(%d): for '%s', at orig line %zu, count is %zu,\n   flag is %s:",
+           __func__, __LINE__, ref->Text(), ref->GetOrigLine(), count,
            pcf_flags_str(flag).c_str());
    log_func_stack_inline(LNEWLINE);
 
@@ -685,12 +689,12 @@ static void newline_min_after(Chunk *ref, size_t count, pcf_flag_e flag)
    {
       pc = pc->GetNext();
    } while (  pc->IsNotNullChunk()
-           && !chunk_is_newline(pc));
+           && !pc->IsNewline());
 
    if (pc->IsNotNullChunk())                 // Coverity CID 76002
    {
-      LOG_FMT(LNEWLINE, "%s(%d): type is %s, orig_line %zu, orig_col %zu\n",
-              __func__, __LINE__, get_token_name(pc->type), pc->orig_line, pc->orig_col);
+      LOG_FMT(LNEWLINE, "%s(%d): type is %s, orig line %zu, orig col %zu\n",
+              __func__, __LINE__, get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetOrigCol());
    }
    Chunk *next = pc->GetNext();
 
@@ -700,20 +704,20 @@ static void newline_min_after(Chunk *ref, size_t count, pcf_flag_e flag)
    }
 
    if (  next->IsComment()
-      && next->nl_count == 1
+      && next->GetNlCount() == 1
       && pc->GetPrev()->IsComment())
    {
       newline_min_after(next, count, flag);
       return;
    }
-   chunk_flags_set(pc, flag);
+   pc->SetFlagBits(flag);
 
-   if (  chunk_is_newline(pc)
+   if (  pc->IsNewline()
       && can_increase_nl(pc))
    {
-      if (pc->nl_count < count)
+      if (pc->GetNlCount() < count)
       {
-         pc->nl_count = count;
+         pc->SetNlCount(count);
          MARK_CHANGE();
       }
    }
@@ -726,15 +730,15 @@ Chunk *newline_add_between(Chunk *start, Chunk *end)
 
    if (  start == nullptr
       || end == nullptr
-      || chunk_is_token(end, CT_IGNORED))
+      || end->Is(CT_IGNORED))
    {
       return(nullptr);
    }
-   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->type),
-           start->orig_line, start->orig_col);
-   LOG_FMT(LNEWLINE, "%s(%d): and end->Text() is '%s', orig_line is %zu, orig_col is %zu\n  ",
-           __func__, __LINE__, end->Text(), end->orig_line, end->orig_col);
+   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()),
+           start->GetOrigLine(), start->GetOrigCol());
+   LOG_FMT(LNEWLINE, "%s(%d): and end->Text() is '%s', orig line is %zu, orig col is %zu\n  ",
+           __func__, __LINE__, end->Text(), end->GetOrigLine(), end->GetOrigCol());
    log_func_stack_inline(LNEWLINE);
 
    // Back-up check for one-liners (should never be true!)
@@ -749,7 +753,7 @@ Chunk *newline_add_between(Chunk *start, Chunk *end)
     */
    for (Chunk *pc = start; pc != end; pc = pc->GetNext())
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          return(pc);
       }
@@ -759,7 +763,7 @@ Chunk *newline_add_between(Chunk *start, Chunk *end)
     * If the second one is a brace open, then check to see
     * if a comment + newline follows
     */
-   if (chunk_is_token(end, CT_BRACE_OPEN))
+   if (end->Is(CT_BRACE_OPEN))
    {
       Chunk *pc = end->GetNext();
 
@@ -767,32 +771,36 @@ Chunk *newline_add_between(Chunk *start, Chunk *end)
       {
          pc = pc->GetNext();
 
-         if (chunk_is_newline(pc))
+         if (pc->IsNewline())
          {
             // are there some more (comment + newline)s ?
             Chunk *pc1 = end->GetNextNcNnl();
 
-            if (!chunk_is_newline(pc1))
+            if (!pc1->IsNewline())
             {
                // yes, go back
                Chunk *pc2 = pc1->GetPrev();
                pc = pc2;
             }
-         }
 
-         if (end == pc)
-         {
-            LOG_FMT(LNEWLINE, "%s(%d): pc1 and pc are identical\n",
-                    __func__, __LINE__);
+            if (end == pc)
+            {
+               LOG_FMT(LNEWLINE, "%s(%d): pc1 and pc are identical\n",
+                       __func__, __LINE__);
+            }
+            else
+            {
+               // Move the open brace to after the newline
+               end->MoveAfter(pc);
+            }
+            LOG_FMT(LNEWLINE, "%s(%d):\n", __func__, __LINE__);
+            newline_add_after(end);
+            return(pc);
          }
-         else
+         else                  // Issue #3873
          {
-            // Move the open brace to after the newline
-            chunk_move_after(end, pc);
+            LOG_FMT(LNEWLINE, "%s(%d):\n", __func__, __LINE__);
          }
-         LOG_FMT(LNEWLINE, "%s(%d):\n", __func__, __LINE__);
-         newline_add_after(end);
-         return(pc);
       }
       else
       {
@@ -813,16 +821,16 @@ void newline_del_between(Chunk *start, Chunk *end)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LNEWLINE, "%s(%d): start->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, start->Text(), start->orig_line, start->orig_col);
-   LOG_FMT(LNEWLINE, "%s(%d): and end->Text() is '%s', orig_line is %zu, orig_col is %zu: preproc=%c/%c\n",
-           __func__, __LINE__, end->Text(), end->orig_line, end->orig_col,
-           start->flags.test(PCF_IN_PREPROC) ? 'y' : 'n',
-           end->flags.test(PCF_IN_PREPROC) ? 'y' : 'n');
+   LOG_FMT(LNEWLINE, "%s(%d): start->Text() is '%s', orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, start->Text(), start->GetOrigLine(), start->GetOrigCol());
+   LOG_FMT(LNEWLINE, "%s(%d): and end->Text() is '%s', orig line is %zu, orig col is %zu: preproc=%c/%c\n",
+           __func__, __LINE__, end->Text(), end->GetOrigLine(), end->GetOrigCol(),
+           start->TestFlags(PCF_IN_PREPROC) ? 'y' : 'n',
+           end->TestFlags(PCF_IN_PREPROC) ? 'y' : 'n');
    log_func_stack_inline(LNEWLINE);
 
    // Can't remove anything if the preproc status differs
-   if (!chunk_same_preproc(start, end))
+   if (!start->IsSamePreproc(end))
    {
       return;
    }
@@ -833,35 +841,35 @@ void newline_del_between(Chunk *start, Chunk *end)
    {
       Chunk *next = pc->GetNext();
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          Chunk *prev = pc->GetPrev();
 
          if (  (  !prev->IsComment()
                && !next->IsComment())
-            || chunk_is_newline(prev)
-            || chunk_is_newline(next))
+            || prev->IsNewline()
+            || next->IsNewline())
          {
-            if (chunk_safe_to_del_nl(pc))
+            if (pc->SafeToDeleteNl())
             {
                if (pc == start)
                {
                   start_removed = true;
                }
-               chunk_del(pc);
+               Chunk::Delete(pc);
                MARK_CHANGE();
 
-               if (prev != nullptr)
+               if (prev->IsNotNullChunk())
                {
-                  align_to_column(next, prev->column + space_col_align(prev, next));
+                  align_to_column(next, prev->GetColumn() + space_col_align(prev, next));
                }
             }
          }
          else
          {
-            if (pc->nl_count > 1)
+            if (pc->GetNlCount() > 1)
             {
-               pc->nl_count = 1;
+               pc->SetNlCount(1);
                MARK_CHANGE();
             }
          }
@@ -870,12 +878,12 @@ void newline_del_between(Chunk *start, Chunk *end)
    } while (pc != end);
 
    if (  !start_removed
-      && chunk_is_str(end, "{")
-      && (  chunk_is_str(start, ")")
-         || chunk_is_token(start, CT_DO)
-         || chunk_is_token(start, CT_ELSE)))
+      && end->IsString("{")
+      && (  start->IsString(")")
+         || start->Is(CT_DO)
+         || start->Is(CT_ELSE)))
    {
-      chunk_move_after(end, start);
+      end->MoveAfter(start);
    }
 } // newline_del_between
 
@@ -890,7 +898,7 @@ void newlines_sparens()
         sparen_open->IsNotNullChunk();
         sparen_open = sparen_open->GetNextType(CT_SPAREN_OPEN, ANY_LEVEL))
    {
-      Chunk *sparen_close = sparen_open->GetNextType(CT_SPAREN_CLOSE, sparen_open->level);
+      Chunk *sparen_close = sparen_open->GetNextType(CT_SPAREN_CLOSE, sparen_open->GetLevel());
 
       if (sparen_close->IsNullChunk())
       {
@@ -900,7 +908,7 @@ void newlines_sparens()
       Chunk *sparen_content_end   = sparen_close->GetPrevNnl();
       bool  is_multiline          = (
          sparen_content_start != sparen_content_end
-                                    && !are_chunks_in_same_line(sparen_content_start, sparen_content_end));
+                                    && !sparen_content_start->IsOnSameLine(sparen_content_end));
 
       // Add a newline after '(' if an if/for/while/switch condition spans multiple lines,
       // as e.g. required by the ROS 2 development style guidelines:
@@ -923,8 +931,8 @@ void newlines_sparens()
          // add/remove trailing newline in an if condition
          Chunk *ctrl_structure = sparen_open->GetPrevNcNnl();
 
-         if (  chunk_is_token(ctrl_structure, CT_IF)
-            || chunk_is_token(ctrl_structure, CT_ELSEIF))
+         if (  ctrl_structure->Is(CT_IF)
+            || ctrl_structure->Is(CT_ELSEIF))
          {
             log_rule_B("nl_before_if_closing_paren");
             newline_iarf_pair(sparen_content_end, sparen_close, options::nl_before_if_closing_paren());
@@ -941,7 +949,7 @@ static bool newlines_if_for_while_switch(Chunk *start, iarf_e nl_opt)
    log_rule_B("nl_define_macro");
 
    if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
+      || (  start->TestFlags(PCF_IN_PREPROC)
          && !options::nl_define_macro()))
    {
       return(false);
@@ -949,13 +957,13 @@ static bool newlines_if_for_while_switch(Chunk *start, iarf_e nl_opt)
    bool  retval = false;
    Chunk *pc    = start->GetNextNcNnl();
 
-   if (chunk_is_token(pc, CT_SPAREN_OPEN))
+   if (pc->Is(CT_SPAREN_OPEN))
    {
-      Chunk *close_paren = pc->GetNextType(CT_SPAREN_CLOSE, pc->level);
+      Chunk *close_paren = pc->GetNextType(CT_SPAREN_CLOSE, pc->GetLevel());
       Chunk *brace_open  = close_paren->GetNextNcNnl();
 
-      if (  (  chunk_is_token(brace_open, CT_BRACE_OPEN)
-            || chunk_is_token(brace_open, CT_VBRACE_OPEN))
+      if (  (  brace_open->Is(CT_BRACE_OPEN)
+            || brace_open->Is(CT_VBRACE_OPEN))
          && one_liner_nl_ok(brace_open))
       {
          log_rule_B("nl_multi_line_cond");
@@ -964,7 +972,7 @@ static bool newlines_if_for_while_switch(Chunk *start, iarf_e nl_opt)
          {
             while ((pc = pc->GetNext()) != close_paren)
             {
-               if (chunk_is_newline(pc))
+               if (pc->IsNewline())
                {
                   nl_opt = IARF_ADD;
                   break;
@@ -972,16 +980,16 @@ static bool newlines_if_for_while_switch(Chunk *start, iarf_e nl_opt)
             }
          }
 
-         if (chunk_is_token(brace_open, CT_VBRACE_OPEN))
+         if (brace_open->Is(CT_VBRACE_OPEN))
          {
             // Can only add - we don't want to create a one-line here
             if (nl_opt & IARF_ADD)
             {
                newline_iarf_pair(close_paren, brace_open->GetNextNcNnl(), nl_opt);
-               pc = brace_open->GetNextType(CT_VBRACE_CLOSE, brace_open->level);
+               pc = brace_open->GetNextType(CT_VBRACE_CLOSE, brace_open->GetLevel());
 
-               if (  !chunk_is_newline(pc->GetPrevNc())
-                  && !chunk_is_newline(pc->GetNextNc()))
+               if (  !pc->GetPrevNc()->IsNewline()
+                  && !pc->GetNextNc()->IsNewline())
                {
                   newline_add_after(pc);
                   retval = true;
@@ -993,12 +1001,12 @@ static bool newlines_if_for_while_switch(Chunk *start, iarf_e nl_opt)
             newline_iarf_pair(close_paren, brace_open, nl_opt);
             Chunk *next = brace_open->GetNextNcNnl();
 
-            if (brace_open->type != next->type)                       // Issue #2836
+            if (brace_open->GetType() != next->GetType())                       // Issue #2836
             {
                newline_add_between(brace_open, brace_open->GetNextNcNnl());
             }
             // Make sure nothing is cuddled with the closing brace
-            pc = brace_open->GetNextType(CT_BRACE_CLOSE, brace_open->level);
+            pc = brace_open->GetNextType(CT_BRACE_CLOSE, brace_open->GetLevel());
             newline_add_between(pc, pc->GetNextNcNnlNet());
             retval = true;
          }
@@ -1012,13 +1020,13 @@ static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LNEWLINE, "%s(%d): start->Text() is '%s', type is %s, orig_line is %zu, orig_column is %zu\n",
-           __func__, __LINE__, start->Text(), get_token_name(start->type), start->orig_line, start->orig_col);
+   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()), start->GetOrigLine(), start->GetOrigCol());
 
    log_rule_B("nl_define_macro");
 
    if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
+      || (  start->TestFlags(PCF_IN_PREPROC)
          && !options::nl_define_macro()))
    {
       return;
@@ -1030,51 +1038,51 @@ static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl
     *   2 newlines in a row (don't add)
     *   something else (don't remove)
     */
-   for (Chunk *pc = start->GetPrev(); pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetPrev())
+   for (Chunk *pc = start->GetPrev(); pc->IsNotNullChunk(); pc = pc->GetPrev())
    {
-      size_t level    = start->level;
+      size_t level    = start->GetLevel();
       bool   do_add   = (nl_opt & IARF_ADD) != IARF_IGNORE;  // forcing value to bool
       Chunk  *last_nl = nullptr;
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          last_nl = pc;
 
          // if we found 2 or more in a row
-         if (  pc->nl_count > 1
-            || chunk_is_newline(pc->GetPrevNvb()))
+         if (  pc->GetNlCount() > 1
+            || pc->GetPrevNvb()->IsNewline())
          {
             // need to remove
             if (  (nl_opt & IARF_REMOVE)
-               && !pc->flags.test(PCF_VAR_DEF))
+               && !pc->TestFlags(PCF_VAR_DEF))
             {
                // if we're also adding, take care of that here
                size_t nl_count = do_add ? 2 : 1;
 
-               if (nl_count != pc->nl_count)
+               if (nl_count != pc->GetNlCount())
                {
-                  pc->nl_count = nl_count;
+                  pc->SetNlCount(nl_count);
                   MARK_CHANGE();
                }
                Chunk *prev;
 
                // can keep using pc because anything other than newline stops loop, and we delete if newline
-               while (chunk_is_newline(prev = pc->GetPrevNvb()))
+               while ((prev = pc->GetPrevNvb())->IsNewline())
                {
                   // Make sure we don't combine a preproc and non-preproc
-                  if (!chunk_safe_to_del_nl(prev))
+                  if (!prev->SafeToDeleteNl())
                   {
                      break;
                   }
-                  chunk_del(prev);
+                  Chunk::Delete(prev);
                   MARK_CHANGE();
                }
             }
             return;
          }
       }
-      else if (  chunk_is_opening_brace(pc)
-              || pc->level < level)
+      else if (  pc->IsBraceOpen()
+              || pc->GetLevel() < level)
       {
          return;
       }
@@ -1086,7 +1094,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl
       }
       else
       {
-         if (  chunk_is_token(pc, CT_CASE_COLON)
+         if (  pc->Is(CT_CASE_COLON)
             && options::nl_before_ignore_after_case())
          {
             return;
@@ -1095,9 +1103,10 @@ 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)
+            if (  last_nl != nullptr
+               && last_nl->IsNotNullChunk())
             {
-               if (last_nl->nl_count < 2)
+               if (last_nl->GetNlCount() < 2)
                {
                   double_newline(last_nl);
                }
@@ -1136,11 +1145,11 @@ static void blank_line_set(Chunk *pc, Option<unsigned> &opt)
    const unsigned optval = opt();
 
    if (  (optval > 0)
-      && (pc->nl_count != optval))
+      && (pc->GetNlCount() != optval))
    {
       LOG_FMT(LBLANKD, "%s(%d): do_blank_lines: %s set line %zu to %u\n",
-              __func__, __LINE__, opt.name(), pc->orig_line, optval);
-      pc->nl_count = optval;
+              __func__, __LINE__, opt.name(), pc->GetOrigLine(), optval);
+      pc->SetNlCount(optval);
       MARK_CHANGE();
    }
 } // blank_line_set
@@ -1154,22 +1163,22 @@ bool do_it_newlines_func_pre_blank_lines(Chunk *last_nl, E_Token start_type)
    {
       return(false);
    }
-   LOG_FMT(LNLFUNCT, "%s(%d): orig_line is %zu, orig_col is %zu, type is %s, Text() is '%s'\n",
+   LOG_FMT(LNLFUNCT, "%s(%d): orig line is %zu, orig col is %zu, type is %s, Text() is '%s'\n",
            __func__, __LINE__,
-           last_nl->orig_line, last_nl->orig_col, get_token_name(last_nl->type), last_nl->Text());
+           last_nl->GetOrigLine(), last_nl->GetOrigCol(), get_token_name(last_nl->GetType()), last_nl->Text());
 
    switch (start_type)
    {
    case CT_FUNC_CLASS_DEF:
    {
       log_rule_B("nl_before_func_class_def");
-      bool diff = options::nl_before_func_class_def() <= last_nl->nl_count;
+      bool diff = options::nl_before_func_class_def() <= last_nl->GetNlCount();
       LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
               __func__, __LINE__, diff ? "TRUE" : "FALSE");
 
       log_rule_B("nl_before_func_class_def");
 
-      if (options::nl_before_func_class_def() != last_nl->nl_count)
+      if (options::nl_before_func_class_def() != last_nl->GetNlCount())
       {
          LOG_FMT(LNLFUNCT, "%s(%d):   set blank line(s) to %u\n",
                  __func__, __LINE__, options::nl_before_func_class_def());
@@ -1181,13 +1190,13 @@ bool do_it_newlines_func_pre_blank_lines(Chunk *last_nl, E_Token start_type)
    case CT_FUNC_CLASS_PROTO:
    {
       log_rule_B("nl_before_func_class_proto");
-      bool diff = options::nl_before_func_class_proto() <= last_nl->nl_count;
+      bool diff = options::nl_before_func_class_proto() <= last_nl->GetNlCount();
       LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
               __func__, __LINE__, diff ? "TRUE" : "FALSE");
 
       log_rule_B("nl_before_func_class_proto");
 
-      if (options::nl_before_func_class_proto() != last_nl->nl_count)
+      if (options::nl_before_func_class_proto() != last_nl->GetNlCount())
       {
          LOG_FMT(LNLFUNCT, "%s(%d):   set blank line(s) to %u\n",
                  __func__, __LINE__, options::nl_before_func_class_proto());
@@ -1198,37 +1207,37 @@ bool do_it_newlines_func_pre_blank_lines(Chunk *last_nl, E_Token start_type)
 
    case CT_FUNC_DEF:
    {
-      LOG_FMT(LNLFUNCT, "%s(%d): nl_before_func_body_def() is %u, last_nl->nl_count is %zu\n",
-              __func__, __LINE__, options::nl_before_func_body_def(), last_nl->nl_count);
+      LOG_FMT(LNLFUNCT, "%s(%d): nl_before_func_body_def() is %u, last_nl new line count is %zu\n",
+              __func__, __LINE__, options::nl_before_func_body_def(), last_nl->GetNlCount());
       log_rule_B("nl_before_func_body_def");
-      bool diff = options::nl_before_func_body_def() <= last_nl->nl_count;
+      bool diff = options::nl_before_func_body_def() <= last_nl->GetNlCount();
       LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
               __func__, __LINE__, diff ? "TRUE" : "FALSE");
 
       log_rule_B("nl_before_func_body_def");
 
-      if (options::nl_before_func_body_def() != last_nl->nl_count)
+      if (options::nl_before_func_body_def() != last_nl->GetNlCount())
       {
          LOG_FMT(LNLFUNCT, "%s(%d):    set blank line(s) to %u\n",
                  __func__, __LINE__, options::nl_before_func_body_def());
          log_rule_B("nl_before_func_body_def");
          blank_line_set(last_nl, options::nl_before_func_body_def);
       }
-      LOG_FMT(LNLFUNCT, "%s(%d): nl_before_func_body_def() is %u, last_nl->nl_count is %zu\n",
-              __func__, __LINE__, options::nl_before_func_body_def(), last_nl->nl_count);
+      LOG_FMT(LNLFUNCT, "%s(%d): nl_before_func_body_def() is %u, last_nl new line count is %zu\n",
+              __func__, __LINE__, options::nl_before_func_body_def(), last_nl->GetNlCount());
       return(diff);
    }
 
    case CT_FUNC_PROTO:
    {
       log_rule_B("nl_before_func_body_proto");
-      bool diff = options::nl_before_func_body_proto() <= last_nl->nl_count;
+      bool diff = options::nl_before_func_body_proto() <= last_nl->GetNlCount();
       LOG_FMT(LNLFUNCT, "%s(%d): is %s\n",
               __func__, __LINE__, diff ? "TRUE" : "FALSE");
 
       log_rule_B("nl_before_func_body_proto");
 
-      if (options::nl_before_func_body_proto() != last_nl->nl_count)
+      if (options::nl_before_func_body_proto() != last_nl->GetNlCount())
       {
          LOG_FMT(LNLFUNCT, "%s(%d):   set blank line(s) to %u\n",
                  __func__, __LINE__, options::nl_before_func_body_proto());
@@ -1241,7 +1250,7 @@ bool do_it_newlines_func_pre_blank_lines(Chunk *last_nl, E_Token start_type)
    default:
    {
       LOG_FMT(LERR, "%s(%d):   setting to blank line(s) at line %zu not possible\n",
-              __func__, __LINE__, last_nl->orig_line);
+              __func__, __LINE__, last_nl->GetOrigLine());
       return(false);
    }
    } // switch
@@ -1270,9 +1279,9 @@ static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
       return;
    }
    LOG_FMT(LNLFUNCT, "%s(%d):    set blank line(s): for <NL> at line %zu, column %zu, start_type is %s\n",
-           __func__, __LINE__, start->orig_line, start->orig_col, get_token_name(start_type));
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol(), get_token_name(start_type));
    LOG_FMT(LNLFUNCT, "%s(%d): BEGIN set blank line(s) for '%s' at line %zu\n",
-           __func__, __LINE__, start->Text(), start->orig_line);
+           __func__, __LINE__, start->Text(), start->GetOrigLine());
    /*
     * look backwards until we find:
     *   - open brace (don't add or remove)
@@ -1283,23 +1292,23 @@ static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
    Chunk  *pc           = nullptr;
    Chunk  *last_nl      = nullptr;
    Chunk  *last_comment = nullptr;
-   size_t first_line    = start->orig_line;
+   size_t first_line    = start->GetOrigLine();
 
-   for (pc = start->GetPrev(); pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetPrev())
+   for (pc = start->GetPrev(); pc->IsNotNullChunk(); pc = pc->GetPrev())
    {
-      LOG_FMT(LNLFUNCT, "%s(%d): orig_line is %zu, orig_col is %zu, type is %s, Text() is '%s', nl_count is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->Text(), pc->nl_count);
+      LOG_FMT(LNLFUNCT, "%s(%d): orig line is %zu, orig col is %zu, type is %s, Text() is '%s', new line count is %zu\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()), pc->Text(), pc->GetNlCount());
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          last_nl = pc;
-         LOG_FMT(LNLFUNCT, "%s(%d):    <chunk_is_newline> found at line %zu, column %zu, nl_count is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
+         LOG_FMT(LNLFUNCT, "%s(%d):    <Chunk::IsNewline> found at line %zu, column %zu, new line count is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetNlCount());
          LOG_FMT(LNLFUNCT, "%s(%d):    last_nl set to %zu\n",
-                 __func__, __LINE__, last_nl->orig_line);
+                 __func__, __LINE__, last_nl->GetOrigLine());
          bool break_now = false;
 
-         if (pc->nl_count > 1)
+         if (pc->GetNlCount() > 1)
          {
             break_now = do_it_newlines_func_pre_blank_lines(last_nl, start_type);
             LOG_FMT(LNLFUNCT, "%s(%d): break_now is %s\n",
@@ -1317,17 +1326,17 @@ static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
       }
       else if (pc->IsComment())
       {
-         LOG_FMT(LNLFUNCT, "%s(%d):    <chunk_is_comment> found at line %zu, column %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+         LOG_FMT(LNLFUNCT, "%s(%d):    <Chunk::IsComment> found at line %zu, column %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
 
-         if (  (  pc->orig_line < first_line
-               && ((first_line - pc->orig_line
-                    - (chunk_is_token(pc, CT_COMMENT_MULTI) ? pc->nl_count : 0))) < 2)
+         if (  (  pc->GetOrigLine() < first_line
+               && ((first_line - pc->GetOrigLine()
+                    - (pc->Is(CT_COMMENT_MULTI) ? pc->GetNlCount() : 0))) < 2)
             || (  last_comment != nullptr
-               && chunk_is_token(pc, CT_COMMENT_CPP)         // combine only cpp comments
-               && chunk_is_token(last_comment, pc->type)     // don't mix comment types
-               && last_comment->orig_line > pc->orig_line
-               && (last_comment->orig_line - pc->orig_line) < 2))
+               && pc->Is(CT_COMMENT_CPP)          // combine only cpp comments
+               && last_comment->Is(pc->GetType()) // don't mix comment types
+               && last_comment->GetOrigLine() > pc->GetOrigLine()
+               && (last_comment->GetOrigLine() - pc->GetOrigLine()) < 2))
          {
             last_comment = pc;
             continue;
@@ -1337,32 +1346,32 @@ static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
                  __func__, __LINE__, break_now ? "TRUE" : "FALSE");
          continue;
       }
-      else if (  chunk_is_token(pc, CT_DESTRUCTOR)
-              || chunk_is_token(pc, CT_TYPE)
-              || chunk_is_token(pc, CT_TEMPLATE)
-              || chunk_is_token(pc, CT_QUALIFIER)
-              || chunk_is_token(pc, CT_PTR_TYPE)
-              || chunk_is_token(pc, CT_BYREF)                  // Issue #2163
-              || chunk_is_token(pc, CT_DC_MEMBER)
-              || chunk_is_token(pc, CT_EXTERN)
-              || (  chunk_is_token(pc, CT_STRING)
-                 && get_chunk_parent_type(pc) == CT_EXTERN))
+      else if (  pc->Is(CT_DESTRUCTOR)
+              || pc->Is(CT_TYPE)
+              || pc->Is(CT_TEMPLATE)
+              || pc->Is(CT_QUALIFIER)
+              || pc->Is(CT_PTR_TYPE)
+              || pc->Is(CT_BYREF)                  // Issue #2163
+              || pc->Is(CT_DC_MEMBER)
+              || pc->Is(CT_EXTERN)
+              || (  pc->Is(CT_STRING)
+                 && pc->GetParentType() == CT_EXTERN))
       {
          LOG_FMT(LNLFUNCT, "%s(%d): first_line set to %zu\n",
-                 __func__, __LINE__, pc->orig_line);
-         first_line = pc->orig_line;
+                 __func__, __LINE__, pc->GetOrigLine());
+         first_line = pc->GetOrigLine();
          continue;
       }
-      else if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-              && get_chunk_parent_type(pc) == CT_TEMPLATE)
+      else if (  pc->Is(CT_ANGLE_CLOSE)
+              && pc->GetParentType() == CT_TEMPLATE)
       {
          LOG_FMT(LNLFUNCT, "%s(%d):\n", __func__, __LINE__);
          // skip template stuff to add newlines before it
-         pc = chunk_skip_to_match_rev(pc);
+         pc = pc->GetOpeningParen();
 
-         if (pc != nullptr)
+         if (pc->IsNotNullChunk())
          {
-            first_line = pc->orig_line;
+            first_line = pc->GetOrigLine();
          }
          continue;
       }
@@ -1384,20 +1393,19 @@ static Chunk *get_closing_brace(Chunk *start)
    LOG_FUNC_ENTRY();
 
    Chunk  *pc;
-   size_t level = start->level;
+   size_t level = start->GetLevel();
 
    for (pc = start; (pc = pc->GetNext())->IsNotNullChunk();)
    {
-      if (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            || chunk_is_token(pc, CT_VBRACE_CLOSE))
-         && pc->level == level)
+      if (  (pc->IsBraceClose())
+         && pc->GetLevel() == level)
       {
          return(pc);
       }
 
       // for some reason, we can have newlines between if and opening brace that are lower level than either
-      if (  !chunk_is_newline(pc)
-         && pc->level < level)
+      if (  !pc->IsNewline()
+         && pc->GetLevel() < level)
       {
          return(nullptr);
       }
@@ -1415,10 +1423,10 @@ static void remove_next_newlines(Chunk *start)
 
    while ((next = start->GetNext())->IsNotNullChunk())
    {
-      if (  chunk_is_newline(next)
-         && chunk_safe_to_del_nl(next))
+      if (  next->IsNewline()
+         && next->SafeToDeleteNl())
       {
-         chunk_del(next);
+         Chunk::Delete(next);
          MARK_CHANGE();
       }
       else if (next->IsVBrace())
@@ -1439,13 +1447,13 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
 
    Chunk *prev;
 
-   LOG_FMT(LNEWLINE, "%s(%d): start->Text() is '%s', type is %s, orig_line is %zu, orig_column is %zu\n",
-           __func__, __LINE__, start->Text(), get_token_name(start->type), start->orig_line, start->orig_col);
+   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()), start->GetOrigLine(), start->GetOrigCol());
 
    log_rule_B("nl_define_macro");
 
    if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
+      || (  start->TestFlags(PCF_IN_PREPROC)
          && !options::nl_define_macro()))
    {
       return;
@@ -1457,14 +1465,14 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
    {
       return;
    }
-   LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type is %s, orig_line is %zu, orig_column is %zu\n",
-           __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
+   LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type is %s, orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetOrigCol());
 
    /*
     * if we're dealing with an if, we actually want to add or remove
     * blank lines after any else
     */
-   if (chunk_is_token(start, CT_IF))
+   if (start->Is(CT_IF))
    {
       Chunk *next;
 
@@ -1473,16 +1481,16 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
          next = pc->GetNextNcNnl();
 
          if (  next->IsNotNullChunk()
-            && (  chunk_is_token(next, CT_ELSE)
-               || chunk_is_token(next, CT_ELSEIF)))
+            && (  next->Is(CT_ELSE)
+               || next->Is(CT_ELSEIF)))
          {
             // point to the closing brace of the else
             if ((pc = get_closing_brace(next)) == nullptr)
             {
                return;
             }
-            LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                    __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
+            LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                    __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetOrigCol());
          }
          else
          {
@@ -1495,17 +1503,17 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
     * if we're dealing with a do/while, we actually want to add or
     * remove blank lines after while and its condition
     */
-   if (chunk_is_token(start, CT_DO))
+   if (start->Is(CT_DO))
    {
       // point to the next semicolon
-      if ((pc = pc->GetNextType(CT_SEMICOLON, start->level))->IsNullChunk())
+      if ((pc = pc->GetNextType(CT_SEMICOLON, start->GetLevel()))->IsNullChunk())
       {
          return;
       }
-      LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
+      LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetOrigCol());
    }
-   bool isVBrace = (chunk_is_token(pc, CT_VBRACE_CLOSE));
+   bool isVBrace = (pc->Is(CT_VBRACE_CLOSE));
 
    if (isVBrace)
    {
@@ -1520,7 +1528,7 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
    {
       return;
    }
-   bool have_pre_vbrace_nl = isVBrace && chunk_is_newline(prev);
+   bool have_pre_vbrace_nl = isVBrace && prev->IsNewline();
 
    if (have_pre_vbrace_nl)
    {
@@ -1538,20 +1546,20 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
       // if chunk before is a vbrace, remove any newlines after it
       if (have_pre_vbrace_nl)
       {
-         if (prev->nl_count != 1)
+         if (prev->GetNlCount() != 1)
          {
-            prev->nl_count = 1;
+            prev->SetNlCount(1);
             MARK_CHANGE();
          }
          remove_next_newlines(pc);
       }
-      else if (  (chunk_is_newline(next = pc->GetNextNvb()))
-              && !next->flags.test(PCF_VAR_DEF))
+      else if (  ((next = pc->GetNextNvb())->IsNewline())
+              && !next->TestFlags(PCF_VAR_DEF))
       {
          // otherwise just deal with newlines after brace
-         if (next->nl_count != 1)
+         if (next->GetNlCount() != 1)
          {
-            next->nl_count = 1;
+            next->SetNlCount(1);
             MARK_CHANGE();
          }
          remove_next_newlines(next);
@@ -1571,82 +1579,82 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
             return;
          }
 
-         if (chunk_is_not_token(next, CT_VBRACE_CLOSE))
+         if (next->IsNot(CT_VBRACE_CLOSE))
          {
             break;
          }
          next = next->GetNextNnl();
       } while (true);
 
-      LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-              __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
+      LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+              __func__, __LINE__, next->Text(), get_token_name(next->GetType()), next->GetOrigLine(), next->GetOrigCol());
 
-      if (chunk_is_not_token(next, CT_BRACE_CLOSE))
+      if (next->IsNot(CT_BRACE_CLOSE))
       {
          // if vbrace, have to check before and after
          // if chunk before vbrace, check its count
-         size_t nl_count = have_pre_vbrace_nl ? prev->nl_count : 0;
-         LOG_FMT(LNEWLINE, "%s(%d): nl_count %zu\n", __func__, __LINE__, nl_count);
+         size_t nl_count = have_pre_vbrace_nl ? prev->GetNlCount() : 0;
+         LOG_FMT(LNEWLINE, "%s(%d): new line count %zu\n", __func__, __LINE__, nl_count);
 
-         if (chunk_is_newline(next = pc->GetNextNvb()))
+         if ((next = pc->GetNextNvb())->IsNewline())
          {
-            LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                    __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
-            nl_count += next->nl_count;
-            LOG_FMT(LNEWLINE, "%s(%d): nl_count is %zu\n", __func__, __LINE__, nl_count);
+            LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                    __func__, __LINE__, next->Text(), get_token_name(next->GetType()), next->GetOrigLine(), next->GetOrigCol());
+            nl_count += next->GetNlCount();
+            LOG_FMT(LNEWLINE, "%s(%d): new line count is %zu\n", __func__, __LINE__, nl_count);
          }
 
          // if we have no newlines, add one and make it double
          if (nl_count == 0)
          {
-            LOG_FMT(LNEWLINE, "%s(%d): nl_count is 0\n", __func__, __LINE__);
+            LOG_FMT(LNEWLINE, "%s(%d): new line count is 0\n", __func__, __LINE__);
 
             if (  ((next = pc->GetNext())->IsNotNullChunk())
                && next->IsComment())
             {
-               LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
+               LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                       __func__, __LINE__, next->Text(), get_token_name(next->GetType()), next->GetOrigLine(), next->GetOrigCol());
                pc = next;
-               LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
+               LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                       __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetOrigCol());
             }
 
             if ((next = newline_add_after(pc))->IsNullChunk())
             {
                return;
             }
-            LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                    __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
+            LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                    __func__, __LINE__, next->Text(), get_token_name(next->GetType()), next->GetOrigLine(), next->GetOrigCol());
             double_newline(next);
          }
          else if (nl_count == 1) // if we don't have enough newlines
          {
-            LOG_FMT(LNEWLINE, "%s(%d): nl_count is 1\n", __func__, __LINE__);
+            LOG_FMT(LNEWLINE, "%s(%d): new line count is 1\n", __func__, __LINE__);
 
-            // if we have a preceeding vbrace, add one after it
+            // if we have a preceding vbrace, add one after it
             if (have_pre_vbrace_nl)
             {
                LOG_FMT(LNEWLINE, "%s(%d): have_pre_vbrace_nl is TRUE\n", __func__, __LINE__);
                next = newline_add_after(pc);
-               LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
+               LOG_FMT(LNEWLINE, "%s(%d): next->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                       __func__, __LINE__, next->Text(), get_token_name(next->GetType()), next->GetOrigLine(), next->GetOrigCol());
             }
             else
             {
                LOG_FMT(LNEWLINE, "%s(%d): have_pre_vbrace_nl is FALSE\n", __func__, __LINE__);
                prev = next->GetPrevNnl();
-               LOG_FMT(LNEWLINE, "%s(%d): prev->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, prev->Text(), get_token_name(prev->type), prev->orig_line, prev->orig_col);
+               LOG_FMT(LNEWLINE, "%s(%d): prev->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                       __func__, __LINE__, prev->Text(), get_token_name(prev->GetType()), prev->GetOrigLine(), prev->GetOrigCol());
                pc = next->GetNextNl();
-               LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                       __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
+               LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                       __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetOrigCol());
                Chunk *pc2 = pc->GetNext();
 
                if (pc2->IsNotNullChunk())
                {
                   pc = pc2;
-                  LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig_line %zu, orig_column %zu\n",
-                          __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
+                  LOG_FMT(LNEWLINE, "%s(%d): pc->Text() is '%s', type %s, orig line %zu, orig col %zu\n",
+                          __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetOrigCol());
                }
                else
                {
@@ -1654,12 +1662,12 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
                }
                log_rule_B("nl_squeeze_ifdef");
 
-               if (  chunk_is_token(pc, CT_PREPROC)
-                  && get_chunk_parent_type(pc) == CT_PP_ENDIF
+               if (  pc->Is(CT_PREPROC)
+                  && pc->GetParentType() == CT_PP_ENDIF
                   && options::nl_squeeze_ifdef())
                {
-                  LOG_FMT(LNEWLINE, "%s(%d): cannot add newline after orig_line %zu due to nl_squeeze_ifdef\n",
-                          __func__, __LINE__, prev->orig_line);
+                  LOG_FMT(LNEWLINE, "%s(%d): cannot add newline after orig line %zu due to nl_squeeze_ifdef\n",
+                          __func__, __LINE__, prev->GetOrigLine());
                }
                else
                {
@@ -1681,7 +1689,7 @@ static void newlines_struct_union(Chunk *start, iarf_e nl_opt, bool leave_traili
    log_rule_B("nl_define_macro");
 
    if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
+      || (  start->TestFlags(PCF_IN_PREPROC)
          && !options::nl_define_macro()))
    {
       return;
@@ -1690,16 +1698,16 @@ static void newlines_struct_union(Chunk *start, iarf_e nl_opt, bool leave_traili
     * step past any junk between the keyword and the open brace
     * Quit if we hit a semicolon or '=', which are not expected.
     */
-   size_t level = start->level;
+   size_t level = start->GetLevel();
    Chunk  *pc   = start->GetNextNcNnl();
 
    while (  pc->IsNotNullChunk()
-         && pc->level >= level)
+         && pc->GetLevel() >= level)
    {
-      if (  pc->level == level
-         && (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_ASSIGN)))
+      if (  pc->GetLevel() == level
+         && (  pc->Is(CT_BRACE_OPEN)
+            || pc->IsSemicolon()
+            || pc->Is(CT_ASSIGN)))
       {
          break;
       }
@@ -1708,19 +1716,18 @@ static void newlines_struct_union(Chunk *start, iarf_e nl_opt, bool leave_traili
    }
 
    // If we hit a brace open, then we need to toy with the newlines
-   if (chunk_is_token(pc, CT_BRACE_OPEN))
+   if (pc->Is(CT_BRACE_OPEN))
    {
       // Skip over embedded C comments
       Chunk *next = pc->GetNext();
 
-      while (chunk_is_token(next, CT_COMMENT))
+      while (next->Is(CT_COMMENT))
       {
          next = next->GetNext();
       }
 
       if (  leave_trailing
-         && !next->IsComment()
-         && !chunk_is_newline(next))
+         && !next->IsCommentOrNewline())
       {
          nl_opt = IARF_IGNORE;
       }
@@ -1743,7 +1750,7 @@ static void newlines_enum(Chunk *start)
 
    log_rule_B("nl_define_macro");
 
-   if (  start->flags.test(PCF_IN_PREPROC)
+   if (  start->TestFlags(PCF_IN_PREPROC)
       && !options::nl_define_macro())
    {
       return;
@@ -1751,35 +1758,35 @@ static void newlines_enum(Chunk *start)
    // look for 'enum class'
    Chunk *pcClass = start->GetNextNcNnl();
 
-   if (chunk_is_token(pcClass, CT_ENUM_CLASS))
+   if (pcClass->Is(CT_ENUM_CLASS))
    {
       log_rule_B("nl_enum_class");
       newline_iarf_pair(start, pcClass, options::nl_enum_class());
       // look for 'identifier'/ 'type'
       Chunk *pcType = pcClass->GetNextNcNnl();
 
-      if (chunk_is_token(pcType, CT_TYPE))
+      if (pcType->Is(CT_TYPE))
       {
          log_rule_B("nl_enum_class_identifier");
          newline_iarf_pair(pcClass, pcType, options::nl_enum_class_identifier());
          // look for ':'
          Chunk *pcColon = pcType->GetNextNcNnl();
 
-         if (chunk_is_token(pcColon, CT_BIT_COLON))
+         if (pcColon->Is(CT_BIT_COLON))
          {
             log_rule_B("nl_enum_identifier_colon");
             newline_iarf_pair(pcType, pcColon, options::nl_enum_identifier_colon());
             // look for 'type' i.e. unsigned
             Chunk *pcType1 = pcColon->GetNextNcNnl();
 
-            if (chunk_is_token(pcType1, CT_TYPE))
+            if (pcType1->Is(CT_TYPE))
             {
                log_rule_B("nl_enum_colon_type");
                newline_iarf_pair(pcColon, pcType1, options::nl_enum_colon_type());
                // look for 'type' i.e. int
                Chunk *pcType2 = pcType1->GetNextNcNnl();
 
-               if (chunk_is_token(pcType2, CT_TYPE))
+               if (pcType2->Is(CT_TYPE))
                {
                   log_rule_B("nl_enum_colon_type");
                   newline_iarf_pair(pcType1, pcType2, options::nl_enum_colon_type());
@@ -1792,16 +1799,16 @@ static void newlines_enum(Chunk *start)
     * step past any junk between the keyword and the open brace
     * Quit if we hit a semicolon or '=', which are not expected.
     */
-   size_t level = start->level;
+   size_t level = start->GetLevel();
    Chunk  *pc   = start->GetNextNcNnl();
 
    while (  pc->IsNotNullChunk()
-         && pc->level >= level)
+         && pc->GetLevel() >= level)
    {
-      if (  pc->level == level
-         && (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_semicolon(pc)
-            || chunk_is_token(pc, CT_ASSIGN)))
+      if (  pc->GetLevel() == level
+         && (  pc->Is(CT_BRACE_OPEN)
+            || pc->IsSemicolon()
+            || pc->Is(CT_ASSIGN)))
       {
          break;
       }
@@ -1810,19 +1817,18 @@ static void newlines_enum(Chunk *start)
    }
 
    // If we hit a brace open, then we need to toy with the newlines
-   if (chunk_is_token(pc, CT_BRACE_OPEN))
+   if (pc->Is(CT_BRACE_OPEN))
    {
       // Skip over embedded C comments
       Chunk *next = pc->GetNext();
 
-      while (chunk_is_token(next, CT_COMMENT))
+      while (next->Is(CT_COMMENT))
       {
          next = next->GetNext();
       }
       iarf_e nl_opt;
 
-      if (  !next->IsComment()
-         && !chunk_is_newline(next))
+      if (!next->IsCommentOrNewline())
       {
          nl_opt = IARF_IGNORE;
       }
@@ -1850,19 +1856,19 @@ static void newlines_namespace(Chunk *start)
    iarf_e nl_opt = options::nl_namespace_brace();
 
    if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
+      || (  start->TestFlags(PCF_IN_PREPROC)
          && !options::nl_define_macro()))
    {
       return;
    }
-   Chunk *braceOpen = start->GetNextType(CT_BRACE_OPEN, start->level);
+   Chunk *braceOpen = start->GetNextType(CT_BRACE_OPEN, start->GetLevel());
 
-   LOG_FMT(LNEWLINE, "%s(%d): braceOpen->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-           __func__, __LINE__, braceOpen->orig_line, braceOpen->orig_col, braceOpen->Text());
+   LOG_FMT(LNEWLINE, "%s(%d): braceOpen orig line is %zu, orig col is %zu, Text() is '%s'\n",
+           __func__, __LINE__, braceOpen->GetOrigLine(), braceOpen->GetOrigCol(), braceOpen->Text());
    // produces much more log output. Use it only debugging purpose
-   //log_pcf_flags(LNEWLINE, braceOpen->flags);
+   //log_pcf_flags(LNEWLINE, braceOpen->GetFlags());
 
-   if (braceOpen->flags.test(PCF_ONE_LINER))
+   if (braceOpen->TestFlags(PCF_ONE_LINER))
    {
       LOG_FMT(LNEWLINE, "%s(%d): is one_liner\n",
               __func__, __LINE__);
@@ -1870,8 +1876,8 @@ static void newlines_namespace(Chunk *start)
    }
    Chunk *beforeBrace = braceOpen->GetPrev();
 
-   LOG_FMT(LNEWLINE, "%s(%d): beforeBrace->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-           __func__, __LINE__, beforeBrace->orig_line, beforeBrace->orig_col, beforeBrace->Text());
+   LOG_FMT(LNEWLINE, "%s(%d): beforeBrace orig line is %zu, orig col is %zu, Text() is '%s'\n",
+           __func__, __LINE__, beforeBrace->GetOrigLine(), beforeBrace->GetOrigCol(), beforeBrace->Text());
    // 'namespace' 'BRACE_OPEN'
    newline_iarf_pair(beforeBrace, braceOpen, nl_opt);
 } // newlines_namespace
@@ -1883,14 +1889,14 @@ static void newlines_cuddle_uncuddle(Chunk *start, iarf_e nl_opt)
 
    log_rule_B("nl_define_macro");
 
-   if (  start->flags.test(PCF_IN_PREPROC)
+   if (  start->TestFlags(PCF_IN_PREPROC)
       && !options::nl_define_macro())
    {
       return;
    }
    Chunk *br_close = start->GetPrevNcNnlNi();   // Issue #2279
 
-   if (chunk_is_token(br_close, CT_BRACE_CLOSE))
+   if (br_close->Is(CT_BRACE_CLOSE))
    {
       newline_iarf_pair(br_close, start, nl_opt);
    }
@@ -1902,9 +1908,10 @@ static void newlines_do_else(Chunk *start, iarf_e nl_opt)
    LOG_FUNC_ENTRY();
 
    log_rule_B("nl_define_macro");
+   log_ruleNL("nl_define_macro", start);
 
    if (  nl_opt == IARF_IGNORE
-      || (  start->flags.test(PCF_IN_PREPROC)
+      || (  start->TestFlags(PCF_IN_PREPROC)
          && !options::nl_define_macro()))
    {
       return;
@@ -1912,8 +1919,8 @@ static void newlines_do_else(Chunk *start, iarf_e nl_opt)
    Chunk *next = start->GetNextNcNnl();
 
    if (  next->IsNotNullChunk()
-      && (  chunk_is_token(next, CT_BRACE_OPEN)
-         || chunk_is_token(next, CT_VBRACE_OPEN)))
+      && (  next->Is(CT_BRACE_OPEN)
+         || next->Is(CT_VBRACE_OPEN)))
    {
       if (!one_liner_nl_ok(next))
       {
@@ -1922,16 +1929,16 @@ static void newlines_do_else(Chunk *start, iarf_e nl_opt)
       }
       LOG_FMT(LNL1LINE, "%s(%d): a new line may be added\n", __func__, __LINE__);
 
-      if (chunk_is_token(next, CT_VBRACE_OPEN))
+      if (next->Is(CT_VBRACE_OPEN))
       {
          // Can only add - we don't want to create a one-line here
          if (nl_opt & IARF_ADD)
          {
             newline_iarf_pair(start, next->GetNextNcNnl(), nl_opt);
-            Chunk *tmp = next->GetNextType(CT_VBRACE_CLOSE, next->level);
+            Chunk *tmp = next->GetNextType(CT_VBRACE_CLOSE, next->GetLevel());
 
-            if (  !chunk_is_newline(tmp->GetNextNc())
-               && !chunk_is_newline(tmp->GetPrevNc()))
+            if (  !tmp->GetNextNc()->IsNewline()
+               && !tmp->GetPrevNc()->IsNewline())
             {
                newline_add_after(tmp);
             }
@@ -1948,70 +1955,109 @@ static void newlines_do_else(Chunk *start, iarf_e nl_opt)
 
 static bool is_var_def(Chunk *pc, Chunk *next)
 {
-   if (  chunk_is_token(pc, CT_DECLTYPE)
-      && chunk_is_token(next, CT_PAREN_OPEN))
+   if (  pc->Is(CT_DECLTYPE)
+      && next->Is(CT_PAREN_OPEN))
    {
       // If current token starts a decltype expression, skip it
-      next = chunk_skip_to_match(next);
+      next = next->GetClosingParen();
       next = next->GetNextNcNnl();
    }
-   else if (!chunk_is_type(pc))
+   else if (!pc->IsTypeDefinition())
    {
       // Otherwise, if the current token is not a type --> not a declaration
       return(false);
    }
-   else if (chunk_is_token(next, CT_DC_MEMBER))
+   else if (next->Is(CT_DC_MEMBER))
    {
       // If next token is CT_DC_MEMBER, skip it
-      next = chunk_skip_dc_member(next);
+      next = next->SkipDcMember();
    }
-   else if (chunk_is_token(next, CT_ANGLE_OPEN))
+   else if (next->Is(CT_ANGLE_OPEN))
    {
       // If we have a template type, skip it
-      next = chunk_skip_to_match(next);
+      next = next->GetClosingParen();
       next = next->GetNextNcNnl();
    }
-   bool is = (  (  chunk_is_type(next)
-                && get_chunk_parent_type(next) != CT_FUNC_DEF)           // Issue #2639
-             || chunk_is_token(next, CT_WORD)
-             || chunk_is_token(next, CT_FUNC_CTOR_VAR));
+   bool is = (  (  next->IsTypeDefinition()
+                && next->GetParentType() != CT_FUNC_DEF)           // Issue #2639
+             || next->Is(CT_WORD)
+             || next->Is(CT_FUNC_CTOR_VAR));
 
    return(is);
 } // is_var_def
 
 
+static bool is_func_call_or_def(Chunk *pc)
+{
+   if (  pc->GetParentType() == CT_FUNC_DEF
+      || pc->GetParentType() == CT_FUNC_CALL
+      || pc->GetParentType() == CT_FUNC_CALL_USER
+      || pc->GetParentType() == CT_FUNC_CLASS_DEF
+      || pc->GetParentType() == CT_OC_CLASS
+      || pc->GetParentType() == CT_OC_MSG_DECL
+      || pc->GetParentType() == CT_CS_PROPERTY
+      || pc->GetParentType() == CT_CPP_LAMBDA)
+   {
+      return(true);
+   }
+   return(false);
+} // is_func_call_or_def
+
+
 // Put newline(s) before and/or after a block of variable definitions
-static Chunk *newline_def_blk(Chunk *start, bool fn_top)
+static Chunk *newline_var_def_blk(Chunk *start)
 {
+//prot_the_line(__func__, __LINE__, 15, 4);
    LOG_FUNC_ENTRY();
 
-   Chunk *prev = start->GetPrevNcNnlNi();               // Issue #2279
+   Chunk *pc           = start;
+   Chunk *prev         = start->GetPrevNcNnlNi(); // Issue #2279
+   bool  did_this_line = false;
+   bool  fn_top        = false;
+   bool  var_blk       = false;
+   bool  first_var_blk = true;
+
+   LOG_FMT(LVARDFBLK, "%s(%d): start orig line is %zu, orig col is %zu, Text() is '%s'\n",
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol(), start->Text());
 
-   // can't be any variable definitions in a "= {" block
-   if (chunk_is_token(prev, CT_ASSIGN))
+   if (start->Is(CT_BRACE_OPEN))
    {
-      Chunk *tmp = start->GetNextType(CT_BRACE_CLOSE, start->level);
-      return(tmp->GetNextNcNnl());
+      // can't be any variable definitions in a "= {" block
+      if (  (prev != nullptr)
+         && prev->IsNotNullChunk()
+         && prev->Is(CT_ASSIGN))
+      {
+         Chunk *tmp = start->GetClosingParen();
+         return(tmp->GetNextNcNnl());
+      }
+      // check if we're at the top of a function definition, or function call with a
+      // possible variable block
+      fn_top = is_func_call_or_def(start);
+      // opening brace is processed, start with next chunk
+      pc = pc->GetNext();
    }
-   Chunk *pc = start->GetNext();
-
-   bool  did_this_line = false;
-   bool  first_var_blk = true;
-   bool  var_blk       = false;
 
    while (  pc->IsNotNullChunk()
-         && (  pc->level >= start->level
-            || pc->level == 0))
+         && (  pc->GetLevel() >= start->GetLevel()
+            || pc->GetLevel() == 0))
    {
-      LOG_FMT(LNL1LINE, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+      LOG_CHUNK(LTOK, pc);
 
       Chunk *next_pc = pc->GetNext();
+      LOG_FMT(LVARDFBLK, "%s(%d): next_pc orig line is %zu, orig col is %zu, type is %s, Text() is '%s'\n",
+              __func__, __LINE__, next_pc->GetOrigLine(), next_pc->GetOrigCol(), get_token_name(next_pc->GetType()), next_pc->Text());
 
-      if (chunk_is_token(next_pc, CT_DC_MEMBER))
+      // If next_pc token is CT_DC_MEMBER, skip it
+      if (next_pc->Is(CT_DC_MEMBER))
       {
-         // If next_pc token is CT_DC_MEMBER, skip it
-         pc = chunk_skip_dc_member(pc);
+         pc = pc->SkipDcMember();
+      }
+
+      // skip qualifiers
+      if (pc->Is(CT_QUALIFIER))
+      {
+         pc = pc->GetNext();
+         continue;
       }
 
       if (pc->IsComment())
@@ -2021,44 +2067,35 @@ static Chunk *newline_def_blk(Chunk *start, bool fn_top)
       }
 
       // process nested braces
-      if (chunk_is_token(pc, CT_BRACE_OPEN))
+      if (pc->Is(CT_BRACE_OPEN))
       {
-         pc = newline_def_blk(pc, false);
+         pc = newline_var_def_blk(pc);
          continue;
       }
 
       // Done with this brace set?
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
+      if (pc->Is(CT_BRACE_CLOSE))
       {
          pc = pc->GetNext();
          break;
       }
 
-      if (pc->IsPreproc())
-      {
-         if (!var_blk)
-         {
-            pc = pc->GetNext();
-            break;
-         }
-      }
-
       // skip vbraces
-      if (chunk_is_token(pc, CT_VBRACE_OPEN))
+      if (pc->Is(CT_VBRACE_OPEN))
       {
-         pc = pc->GetNextType(CT_VBRACE_CLOSE, pc->level);
+         pc = pc->GetNextType(CT_VBRACE_CLOSE, pc->GetLevel());
          pc = pc->GetNext();
          continue;
       }
 
       // Ignore stuff inside parenthesis/squares/angles
-      if (pc->level > pc->brace_level)
+      if (pc->GetLevel() > pc->GetBraceLevel())
       {
          pc = pc->GetNext();
          continue;
       }
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          did_this_line = false;
          pc            = pc->GetNext();
@@ -2067,137 +2104,161 @@ static Chunk *newline_def_blk(Chunk *start, bool fn_top)
 
       // Determine if this is a variable definition or code
       if (  !did_this_line
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_DEF)
-         && chunk_is_not_token(pc, CT_FUNC_CLASS_PROTO)
-         && (  (pc->level == (start->level + 1))
-            || pc->level == 0))
+         && pc->IsNot(CT_FUNC_CLASS_DEF)
+         && pc->IsNot(CT_FUNC_CLASS_PROTO)
+         && (  (pc->GetLevel() == (start->GetLevel() + 1))
+            || pc->GetLevel() == 0))
       {
          Chunk *next = pc->GetNextNcNnl();
+         LOG_FMT(LVARDFBLK, "%s(%d): next orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text());
 
-         if (  chunk_is_token(next, CT_PTR_TYPE) // Issue #2692
-            || chunk_is_token(next, CT_BYREF))   // Issue #3018
+         // skip over all other type-like things
+         while (  next->Is(CT_PTR_TYPE)  // Issue #2692
+               || next->Is(CT_BYREF)     // Issue #3018
+               || next->Is(CT_QUALIFIER)
+               || next->Is(CT_TSQUARE))
          {
             next = next->GetNextNcNnl();
+            LOG_FMT(LVARDFBLK, "%s(%d): next orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text());
          }
 
          if (next->IsNullChunk())
          {
             break;
          }
-         LOG_FMT(LNL1LINE, "%s(%d): next->orig_line is %zu, next->orig_col is %zu, Text() is '%s'\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->Text());
+         LOG_FMT(LVARDFBLK, "%s(%d): next orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text());
 
          prev = pc->GetPrevNcNnl();
 
-         while (  chunk_is_token(prev, CT_DC_MEMBER)
-               || chunk_is_token(prev, CT_TYPE))
+         while (  prev->Is(CT_DC_MEMBER)
+               || prev->Is(CT_QUALIFIER)
+               || prev->Is(CT_TYPE))
          {
             prev = prev->GetPrevNcNnl();
          }
 
-         if (!(chunk_is_opening_brace(prev) || chunk_is_closing_brace(prev)))
+         if (!(  prev->IsBraceOpen()
+              || prev->IsBraceClose()))
          {
-            prev = pc->GetPrevType(CT_SEMICOLON, pc->level);
+            prev = pc->GetPrevType(CT_SEMICOLON, pc->GetLevel());
          }
 
          if (prev->IsNullChunk())
          {
-            prev = pc->GetPrevType(CT_BRACE_OPEN, pc->level - 1);      // Issue #2692
+            prev = pc->GetPrevType(CT_BRACE_OPEN, pc->GetLevel() - 1);      // Issue #2692
          }
 
-         if (  chunk_is_token(prev, CT_STRING)
-            && get_chunk_parent_type(prev) == CT_EXTERN
-            && chunk_is_token(prev->prev, CT_EXTERN))
+         if (  prev->Is(CT_STRING)
+            && prev->GetParentType() == CT_EXTERN
+            && prev->GetPrev()->Is(CT_EXTERN))
          {
             prev = prev->GetPrev()->GetPrevNcNnlNi();   // Issue #2279
          }
+         LOG_FMT(LVARDFBLK, "%s(%d): pc orig line is %zu, orig col is %zu, type is %s, Text() is '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()), pc->Text());
+         LOG_FMT(LVARDFBLK, "%s(%d): next orig line is %zu, orig col is %zu, type is %s, Text() is '%s'\n",
+                 __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), get_token_name(next->GetType()), next->Text());
 
          if (is_var_def(pc, next))
          {
-            LOG_FMT(LBLANKD, "%s(%d): 'typ==var' found: '%s %s' at line %zu\n",
-                    __func__, __LINE__, pc->Text(), next->Text(), pc->orig_line);
+            LOG_FMT(LVARDFBLK, "%s(%d): 'typ==var' found: '%s %s' at line %zu\n",
+                    __func__, __LINE__, pc->Text(), next->Text(), pc->GetOrigLine());
+            LOG_FMT(LBLANKD, "%s(%d): var_blk %s, first_var_blk %s, fn_top %s\n",
+                    __func__, __LINE__, var_blk ? "TRUE" : "FALSE",
+                    first_var_blk ? "TRUE" : "FALSE", fn_top ? "TRUE" : "FALSE");
             // Put newline(s) before a block of variable definitions
             log_rule_B("nl_var_def_blk_start");
 
             if (  !var_blk
-               && first_var_blk
+               && !first_var_blk
                && options::nl_var_def_blk_start() > 0)
             {
-               LOG_FMT(LBLANKD, "%s(%d): pc is '%s', orig_line is %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->orig_line);
+               LOG_FMT(LVARDFBLK, "%s(%d): pc is '%s', orig line is %zu\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine());
 
                if (prev == nullptr)
                {
-                  LOG_FMT(LBLANKD, "%s(%d): prev is nullptr\n", __func__, __LINE__);
+                  LOG_FMT(LVARDFBLK, "%s(%d): prev is nullptr\n", __func__, __LINE__);
                }
                else
                {
-                  LOG_FMT(LBLANKD, "%s(%d): prev is '%s', orig_line is %zu\n",
-                          __func__, __LINE__, prev->Text(), prev->orig_line);
+                  LOG_FMT(LVARDFBLK, "%s(%d): prev is '%s', orig line is %zu\n",
+                          __func__, __LINE__, prev->Text(), prev->GetOrigLine());
 
-                  if (!chunk_is_opening_brace(prev))
+                  if (!prev->IsBraceOpen())
                   {
                      newline_min_after(prev, options::nl_var_def_blk_start() + 1, PCF_VAR_DEF);
                   }
                }
             }
-
             // set newlines within var def block
+            log_rule_B("nl_var_def_blk_in");
+
             if (  var_blk
                && (options::nl_var_def_blk_in() > 0))
             {
-               log_rule_B("nl_var_def_blk_in");
                prev = pc->GetPrev();
-               LOG_FMT(LNL1LINE, "%s(%d): prev->orig_line is %zu, prev->orig_col is %zu, Text() is '%s'\n",
-                       __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text());
+               LOG_FMT(LVARDFBLK, "%s(%d): prev orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                       __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text());
 
-               if (chunk_is_newline(prev))
+               if (prev->IsNewline())
                {
-                  log_rule_B("nl_var_def_blk_in");
-
-                  if (prev->nl_count > options::nl_var_def_blk_in())
+                  if (prev->GetNlCount() > options::nl_var_def_blk_in())
                   {
-                     prev->nl_count = options::nl_var_def_blk_in();
+                     prev->SetNlCount(options::nl_var_def_blk_in());
                      MARK_CHANGE();
                   }
                }
             }
-            pc      = pc->GetNextType(CT_SEMICOLON, pc->level);
+            pc      = pc->GetNextType(CT_SEMICOLON, pc->GetLevel());
             var_blk = true;
          }
          else if (var_blk)
          {
+            LOG_FMT(LVARDFBLK, "%s(%d): var_blk %s, first_var_blk %s, fn_top %s\n",
+                    __func__, __LINE__, var_blk ? "TRUE" : "FALSE",
+                    first_var_blk ? "TRUE" : "FALSE", fn_top ? "TRUE" : "FALSE");
+            log_rule_B("nl_var_def_blk_end_func_top");
             log_rule_B("nl_var_def_blk_end");
 
-            if (options::nl_var_def_blk_end() > 0)
+            if (  first_var_blk
+               && fn_top)
             {
-               // Issue #3516
-               newline_min_after(prev, options::nl_var_def_blk_end() + 1, PCF_VAR_DEF);
+               // set blank lines after first var def block at the top of a function
+               if (options::nl_var_def_blk_end_func_top() > 0)
+               {
+                  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);
+               }
             }
-            // set blank lines after first var def block
-            log_rule_B("nl_func_var_def_blk");
-            LOG_FMT(LBLANKD, "%s(%d): first_var_blk %s\n",
-                    __func__, __LINE__, first_var_blk ? "TRUE" : "FALSE");
-            LOG_FMT(LBLANKD, "%s(%d): fn_top %s\n",
-                    __func__, __LINE__, fn_top ? "TRUE" : "FALSE");
-
-            if (  first_var_blk
-               && fn_top
-               && (options::nl_func_var_def_blk() > 0))
+            else if (  !pc->IsPreproc()
+                    && options::nl_var_def_blk_end() > 0)
             {
-               LOG_FMT(LBLANKD, "%s(%d): nl_func_var_def_blk at line %zu\n",
-                       __func__, __LINE__, prev->orig_line);
-               log_rule_B("nl_func_var_def_blk");
-               newline_min_after(prev, options::nl_func_var_def_blk() + 1, PCF_VAR_DEF);
+               // set blank lines after other var def blocks
+               LOG_FMT(LVARDFBLK, "%s(%d): nl_var_def_blk_end at line %zu\n",
+                       __func__, __LINE__, prev->GetOrigLine());
+               // Issue #3516
+               newline_min_after(prev, options::nl_var_def_blk_end() + 1, PCF_VAR_DEF);
             }
             // reset the variables for the next block
-            first_var_blk = true;
+            prot_the_line(__func__, __LINE__, 15, 4);
+            first_var_blk = false;
+            var_blk       = false;
+         }
+         else
+         {
+            first_var_blk = false;
             var_blk       = false;
          }
       }
       else
       {
-         if (chunk_is_token(pc, CT_FUNC_CLASS_DEF))
+         if (pc->Is(CT_FUNC_CLASS_DEF))
          {
             log_rule_B("nl_var_def_blk_end");
 
@@ -2221,35 +2282,28 @@ static Chunk *newline_def_blk(Chunk *start, bool fn_top)
       }
       pc = pc->GetNext();
    }
+   LOG_FMT(LVARDFBLK, "%s(%d): pc 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());
+   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_def_blk
+} // newline_var_def_blk
 
 
-static bool collapse_empty_body(Chunk *br_open)
+static void collapse_empty_body(Chunk *br_open)
 {
-   log_rule_B("nl_collapse_empty_body");
-
-   if (  !options::nl_collapse_empty_body()
-      || !chunk_is_token(br_open->GetNextNnl(), CT_BRACE_CLOSE))
+   for (Chunk *pc = br_open->GetNext(); pc->IsNot(CT_BRACE_CLOSE); pc = pc->GetNext())
    {
-      return(false);
-   }
-
-   for (Chunk *pc = br_open->GetNext()
-        ; chunk_is_not_token(pc, CT_BRACE_CLOSE)
-        ; pc = pc->GetNext())
-   {
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         && chunk_safe_to_del_nl(pc))
+      if (  pc->Is(CT_NEWLINE)
+         && pc->SafeToDeleteNl())
       {
-         pc = pc->prev;
-         Chunk *next = pc->next;
-         chunk_del(next);
+         pc = pc->GetPrev();
+         Chunk *next = pc->GetNext();
+         Chunk::Delete(next);
          MARK_CHANGE();
       }
    }
-
-   return(true);
 } // collapse_empty_body
 
 
@@ -2259,22 +2313,22 @@ static void newlines_brace_pair(Chunk *br_open)
 
    log_rule_B("nl_define_macro");
 
-   if (  br_open->flags.test(PCF_IN_PREPROC)
+   if (  br_open->TestFlags(PCF_IN_PREPROC)
       && !options::nl_define_macro())
    {
       return;
    }
 
    //fixes 1235 Add single line namespace support
-   if (  chunk_is_token(br_open, CT_BRACE_OPEN)
-      && (get_chunk_parent_type(br_open) == CT_NAMESPACE)
-      && chunk_is_newline(br_open->GetPrev()))
+   if (  br_open->Is(CT_BRACE_OPEN)
+      && (br_open->GetParentType() == CT_NAMESPACE)
+      && br_open->GetPrev()->IsNewline())
    {
-      Chunk *chunk_brace_close = chunk_skip_to_match(br_open, E_Scope::ALL);
+      Chunk *chunk_brace_close = br_open->GetClosingParen();
 
-      if (chunk_brace_close != nullptr)
+      if (chunk_brace_close->IsNotNullChunk())
       {
-         if (are_chunks_in_same_line(br_open, chunk_brace_close))
+         if (br_open->IsOnSameLine(chunk_brace_close))
          {
             log_rule_B("nl_namespace_two_to_one_liner - 1");
 
@@ -2295,27 +2349,27 @@ static void newlines_brace_pair(Chunk *br_open)
    // fix 1247 oneliner function support - converts 4,3,2  liners to oneliner
    log_rule_B("nl_create_func_def_one_liner");
 
-   if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
+   if (  br_open->GetParentType() == CT_FUNC_DEF
       && options::nl_create_func_def_one_liner()
-      && !br_open->flags.test(PCF_NOT_POSSIBLE))          // Issue #2795
+      && !br_open->TestFlags(PCF_NOT_POSSIBLE))          // Issue #2795
    {
-      Chunk *br_close = chunk_skip_to_match(br_open, E_Scope::ALL);
+      Chunk *br_close = br_open->GetClosingParen();
       Chunk *tmp      = br_open->GetPrevNcNnlNi(); // Issue #2279
 
-      if (  br_close != nullptr                    // Issue #2594
-         && ((br_close->orig_line - br_open->orig_line) <= 2)
-         && chunk_is_paren_close(tmp))             // need to check the conditions.
+      if (  br_close->IsNotNullChunk()             // Issue #2594
+         && ((br_close->GetOrigLine() - br_open->GetOrigLine()) <= 2)
+         && tmp->IsParenClose())                   // need to check the conditions.
       {
          // Issue #1825
          bool is_it_possible = true;
 
          while (  tmp->IsNotNullChunk()
                && (tmp = tmp->GetNext())->IsNotNullChunk()
-               && !chunk_is_closing_brace(tmp)
+               && !tmp->IsBraceClose()
                && (tmp->GetNext()->IsNotNullChunk()))
          {
-            LOG_FMT(LNL1LINE, "%s(%d): tmp->orig_line is %zu, tmp->orig_col is %zu, Text() is '%s'\n",
-                    __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
+            LOG_FMT(LNL1LINE, "%s(%d): tmp orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
 
             if (tmp->IsComment())
             {
@@ -2341,8 +2395,8 @@ static void newlines_brace_pair(Chunk *br_open)
 
                while (current->IsNotNullChunk())
                {
-                  LOG_FMT(LNL1LINE, "%s(%d): zu  kopieren: current->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                          __func__, __LINE__, current->orig_line, current->orig_col, current->Text());
+                  LOG_FMT(LNL1LINE, "%s(%d): zu  kopieren: current orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                          __func__, __LINE__, current->GetOrigLine(), current->GetOrigCol(), current->Text());
                   saved_chunk.push_back(*current);
                   Chunk *the_next = current->GetNext();
 
@@ -2358,29 +2412,29 @@ static void newlines_brace_pair(Chunk *br_open)
 
             while (  tmp_1->IsNotNullChunk()
                   && (tmp_1 = tmp_1->GetNext())->IsNotNullChunk()
-                  && !chunk_is_closing_brace(tmp_1)
+                  && !tmp_1->IsBraceClose()
                   && (tmp_1->GetNext()->IsNotNullChunk()))
             {
-               LOG_FMT(LNL1LINE, "%s(%d): tmp_1->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                       __func__, __LINE__, tmp_1->orig_line, tmp_1->orig_col, tmp_1->Text());
+               LOG_FMT(LNL1LINE, "%s(%d): tmp_1 orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                       __func__, __LINE__, tmp_1->GetOrigLine(), tmp_1->GetOrigCol(), tmp_1->Text());
 
-               if (chunk_is_newline(tmp_1))
+               if (tmp_1->IsNewline())
                {
                   tmp_1 = tmp_1->GetPrev();                 // Issue #1825
                   newline_iarf_pair(tmp_1, tmp_1->GetNextNcNnl(), IARF_REMOVE);
                }
             }
-            chunk_flags_set(br_open, PCF_ONE_LINER);         // set the one liner flag if needed
-            chunk_flags_set(br_close, PCF_ONE_LINER);
+            br_open->SetFlagBits(PCF_ONE_LINER);         // set the one liner flag if needed
+            br_close->SetFlagBits(PCF_ONE_LINER);
             log_rule_B("code_width");
 
             if (  options::code_width() > 0
-               && br_close->column > options::code_width())
+               && br_close->GetColumn() > options::code_width())
             {
                // the created line is too long
                // it is not possible to make an one_liner
                // because the line would be too long
-               chunk_flags_set(br_open, PCF_NOT_POSSIBLE);
+               br_open->SetFlagBits(PCF_NOT_POSSIBLE);
                // restore the code
                size_t count;
                Chunk  tmp_2;
@@ -2390,18 +2444,18 @@ static void newlines_brace_pair(Chunk *br_open)
                {
                   tmp_2 = saved_chunk.at(count);
 
-                  if (tmp_2.orig_line != current->orig_line)
+                  if (tmp_2.GetOrigLine() != current->GetOrigLine())
                   {
                      // restore the newline
                      Chunk chunk;
-                     set_chunk_type(&chunk, CT_NEWLINE);
-                     chunk.orig_line = current->orig_line;
-                     chunk.orig_col  = current->orig_col;
-                     chunk.pp_level  = current->pp_level;
-                     chunk.nl_count  = 1;
-                     chunk_add_before(&chunk, current);
+                     chunk.SetType(CT_NEWLINE);
+                     chunk.SetOrigLine(current->GetOrigLine());
+                     chunk.SetOrigCol(current->GetOrigCol());
+                     chunk.SetPpLevel(current->GetPpLevel());
+                     chunk.SetNlCount(1);
+                     chunk.CopyAndAddBefore(current);
                      LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline before '%s'\n",
-                             __func__, __LINE__, current->orig_line, current->orig_col, current->Text());
+                             __func__, __LINE__, current->GetOrigLine(), current->GetOrigCol(), current->Text());
                   }
                   else
                   {
@@ -2416,8 +2470,8 @@ static void newlines_brace_pair(Chunk *br_open)
    // Make sure we don't break a one-liner
    if (!one_liner_nl_ok(br_open))
    {
-      LOG_FMT(LNL1LINE, "%s(%d): br_open->orig_line is %zu, br_open->orig_col is %zu, a new line may NOT be added\n",
-              __func__, __LINE__, br_open->orig_line, br_open->orig_col);
+      LOG_FMT(LNL1LINE, "%s(%d): br_open orig line is %zu, orig col is %zu, a new line may NOT be added\n",
+              __func__, __LINE__, br_open->GetOrigLine(), br_open->GetOrigCol());
       return;
    }
    LOG_FMT(LNL1LINE, "%s(%d): a new line may be added\n", __func__, __LINE__);
@@ -2425,14 +2479,14 @@ static void newlines_brace_pair(Chunk *br_open)
    Chunk *next = br_open->GetNextNc();
 
    // Insert a newline between the '=' and open brace, if needed
-   LOG_FMT(LNL1LINE, "%s(%d): br_open->Text() '%s', br_open->type [%s], br_open->parent_type [%s]\n",
-           __func__, __LINE__, br_open->Text(), get_token_name(br_open->type),
-           get_token_name(get_chunk_parent_type(br_open)));
+   LOG_FMT(LNL1LINE, "%s(%d): br_open->Text() '%s', br_open->GetType() [%s], br_open->GetParentType() [%s]\n",
+           __func__, __LINE__, br_open->Text(), get_token_name(br_open->GetType()),
+           get_token_name(br_open->GetParentType()));
 
-   if (get_chunk_parent_type(br_open) == CT_ASSIGN)
+   if (br_open->GetParentType() == CT_ASSIGN)
    {
       // Only mess with it if the open brace is followed by a newline
-      if (chunk_is_newline(next))
+      if (next->IsNewline())
       {
          Chunk *prev = br_open->GetPrevNcNnlNi();   // Issue #2279
          log_rule_B("nl_assign_brace");
@@ -2440,28 +2494,28 @@ static void newlines_brace_pair(Chunk *br_open)
       }
    }
 
-   if (  get_chunk_parent_type(br_open) == CT_OC_MSG_DECL
-      || get_chunk_parent_type(br_open) == CT_FUNC_DEF
-      || get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-      || get_chunk_parent_type(br_open) == CT_OC_CLASS
-      || get_chunk_parent_type(br_open) == CT_CS_PROPERTY
-      || get_chunk_parent_type(br_open) == CT_CPP_LAMBDA
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL_USER)
+   if (  br_open->GetParentType() == CT_OC_MSG_DECL
+      || br_open->GetParentType() == CT_FUNC_DEF
+      || br_open->GetParentType() == CT_FUNC_CLASS_DEF
+      || br_open->GetParentType() == CT_OC_CLASS
+      || br_open->GetParentType() == CT_CS_PROPERTY
+      || br_open->GetParentType() == CT_CPP_LAMBDA
+      || br_open->GetParentType() == CT_FUNC_CALL
+      || br_open->GetParentType() == CT_FUNC_CALL_USER)
    {
       Chunk  *prev = Chunk::NullChunkPtr;
       iarf_e val;
 
-      if (get_chunk_parent_type(br_open) == CT_OC_MSG_DECL)
+      if (br_open->GetParentType() == CT_OC_MSG_DECL)
       {
          log_rule_B("nl_oc_mdef_brace");
          val = options::nl_oc_mdef_brace();
       }
       else
       {
-         if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
-            || get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-            || get_chunk_parent_type(br_open) == CT_OC_CLASS)
+         if (  br_open->GetParentType() == CT_FUNC_DEF
+            || br_open->GetParentType() == CT_FUNC_CLASS_DEF
+            || br_open->GetParentType() == CT_OC_CLASS)
          {
             val = IARF_NOT_DEFINED;
             log_rule_B("nl_fdef_brace_cond");
@@ -2471,7 +2525,7 @@ static void newlines_brace_pair(Chunk *br_open)
             {
                prev = br_open->GetPrevNcNnlNi();   // Issue #2279
 
-               if (chunk_is_token(prev, CT_FPAREN_CLOSE))
+               if (prev->Is(CT_FPAREN_CLOSE))
                {
                   val = nl_fdef_brace_cond_v;
                }
@@ -2488,9 +2542,9 @@ static void newlines_brace_pair(Chunk *br_open)
             log_rule_B("nl_property_brace");
             log_rule_B("nl_cpp_ldef_brace");
             log_rule_B("nl_fcall_brace");
-            val = ((get_chunk_parent_type(br_open) == CT_CS_PROPERTY) ?
+            val = ((br_open->GetParentType() == CT_CS_PROPERTY) ?
                    options::nl_property_brace() :
-                   ((get_chunk_parent_type(br_open) == CT_CPP_LAMBDA) ?
+                   ((br_open->GetParentType() == CT_CPP_LAMBDA) ?
                     options::nl_cpp_ldef_brace() :
                     options::nl_fcall_brace()));
          }
@@ -2507,24 +2561,46 @@ static void newlines_brace_pair(Chunk *br_open)
       }
    }
 
-   if (collapse_empty_body(br_open))
+   if (br_open->GetNextNnl()->Is(CT_BRACE_CLOSE))
    {
-      return;
+      // Chunk is "{" and "}" with only whitespace/newlines in between
+
+      if (br_open->GetParentType() == CT_FUNC_DEF)
+      {
+         // Braces belong to a function definition
+         log_rule_B("nl_collapse_empty_body_functions");
+
+         if (options::nl_collapse_empty_body_functions())
+         {
+            collapse_empty_body(br_open);
+            return;
+         }
+      }
+      else
+      {
+         log_rule_B("nl_collapse_empty_body");
+
+         if (options::nl_collapse_empty_body())
+         {
+            collapse_empty_body(br_open);
+            return;
+         }
+      }
    }
    //fixes #1245 will add new line between tsquare and brace open based on nl_tsquare_brace
 
-   if (chunk_is_token(br_open, CT_BRACE_OPEN))
+   if (br_open->Is(CT_BRACE_OPEN))
    {
-      Chunk *chunk_closeing_brace = chunk_skip_to_match(br_open, E_Scope::ALL);
+      Chunk *chunk_closing_brace = br_open->GetClosingParen();
 
-      if (chunk_closeing_brace != nullptr)
+      if (chunk_closing_brace->IsNotNullChunk())
       {
-         if (chunk_closeing_brace->orig_line > br_open->orig_line)
+         if (chunk_closing_brace->GetOrigLine() > br_open->GetOrigLine())
          {
             Chunk *prev = br_open->GetPrevNc();
 
-            if (  chunk_is_token(prev, CT_TSQUARE)
-               && chunk_is_newline(next))
+            if (  prev->Is(CT_TSQUARE)
+               && next->IsNewline())
             {
                log_rule_B("nl_tsquare_brace");
                newline_iarf_pair(prev, br_open, options::nl_tsquare_brace());
@@ -2537,28 +2613,28 @@ static void newlines_brace_pair(Chunk *br_open)
 
    if (options::eat_blanks_after_open_brace())
    {
-      if (chunk_is_newline(next))
+      if (next->IsNewline())
       {
          log_rule_B("nl_inside_empty_func");
          log_rule_B("nl_inside_namespace");
 
          if (  options::nl_inside_empty_func() > 0
-            && chunk_is_token(br_open->GetNextNnl(), CT_BRACE_CLOSE)
-            && (  get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-               || get_chunk_parent_type(br_open) == CT_FUNC_DEF))
+            && br_open->GetNextNnl()->Is(CT_BRACE_CLOSE)
+            && (  br_open->GetParentType() == CT_FUNC_CLASS_DEF
+               || br_open->GetParentType() == CT_FUNC_DEF))
          {
             blank_line_set(next, options::nl_inside_empty_func);
          }
          else if (  options::nl_inside_namespace() > 0
-                 && get_chunk_parent_type(br_open) == CT_NAMESPACE)
+                 && br_open->GetParentType() == CT_NAMESPACE)
          {
             blank_line_set(next, options::nl_inside_namespace);
          }
-         else if (next->nl_count > 1)
+         else if (next->GetNlCount() > 1)
          {
-            next->nl_count = 1;
+            next->SetNlCount(1);
             LOG_FMT(LBLANKD, "%s(%d): eat_blanks_after_open_brace %zu\n",
-                    __func__, __LINE__, next->orig_line);
+                    __func__, __LINE__, next->GetOrigLine());
             MARK_CHANGE();
          }
       }
@@ -2566,37 +2642,19 @@ static void newlines_brace_pair(Chunk *br_open)
    bool nl_close_brace = false;
 
    // Handle the cases where the brace is part of a function call or definition
-   if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL
-      || get_chunk_parent_type(br_open) == CT_FUNC_CALL_USER
-      || get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
-      || get_chunk_parent_type(br_open) == CT_OC_CLASS
-      || get_chunk_parent_type(br_open) == CT_OC_MSG_DECL
-      || get_chunk_parent_type(br_open) == CT_CS_PROPERTY
-      || get_chunk_parent_type(br_open) == CT_CPP_LAMBDA)
+   if (is_func_call_or_def(br_open))
    {
       // Need to force a newline before the close brace, if not in a class body
-      if (!br_open->flags.test(PCF_IN_CLASS))
+      if (!br_open->TestFlags(PCF_IN_CLASS))
       {
          nl_close_brace = true;
       }
       // handle newlines after the open brace
       Chunk *pc = br_open->GetNextNcNnl();
       newline_add_between(br_open, pc);
-
-      Chunk *ne             = pc->GetNextNcNnl();
-      bool  this_is_var_def = is_var_def(pc, ne);                          // Issue #3518
-      newline_def_blk(br_open, this_is_var_def);
-   }
-
-   // Handle the cases where the brace is part of a class or struct
-   if (  get_chunk_parent_type(br_open) == CT_CLASS
-      || get_chunk_parent_type(br_open) == CT_STRUCT)
-   {
-      newline_def_blk(br_open, false);
    }
    // Grab the matching brace close
-   Chunk *br_close = br_open->GetNextType(CT_BRACE_CLOSE, br_open->level);
+   Chunk *br_close = br_open->GetNextType(CT_BRACE_CLOSE, br_open->GetLevel());
 
    if (br_close->IsNullChunk())
    {
@@ -2612,13 +2670,12 @@ static void newlines_brace_pair(Chunk *br_open)
        */
       Chunk *pc = br_open->GetNext();
 
-      while (chunk_is_token(pc, CT_COMMENT))
+      while (pc->Is(CT_COMMENT))
       {
          pc = pc->GetNext();
       }
 
-      if (  chunk_is_newline(pc)
-         || pc->IsComment())
+      if (pc->IsCommentOrNewline())
       {
          nl_close_brace = true;
       }
@@ -2641,8 +2698,8 @@ static void newline_case(Chunk *start)
    LOG_FUNC_ENTRY();
 
    //   printf("%s case (%s) on line %d col %d\n",
-   //          __func__, c_chunk_names[start->type],
-   //          start->orig_line, start->orig_col);
+   //          __func__, c_chunk_names[start->GetType()],
+   //          start->GetOrigLine(), start->GetOrigCol());
 
    // Scan backwards until a '{' or ';' or ':'. Abort if a multi-newline is found
    Chunk *prev = start;
@@ -2652,15 +2709,15 @@ static void newline_case(Chunk *start)
       prev = prev->GetPrevNc();
 
       if (  prev->IsNotNullChunk()
-         && chunk_is_newline(prev)
-         && prev->nl_count > 1)
+         && prev->IsNewline()
+         && prev->GetNlCount() > 1)
       {
          return;
       }
-   } while (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-           && chunk_is_not_token(prev, CT_BRACE_CLOSE)
-           && chunk_is_not_token(prev, CT_SEMICOLON)
-           && chunk_is_not_token(prev, CT_CASE_COLON));
+   } while (  prev->IsNot(CT_BRACE_OPEN)
+           && prev->IsNot(CT_BRACE_CLOSE)
+           && prev->IsNot(CT_SEMICOLON)
+           && prev->IsNot(CT_CASE_COLON));
 
    if (prev->IsNullChunk())
    {
@@ -2674,11 +2731,11 @@ static void newline_case(Chunk *start)
    }
 
    // Only add an extra line after a semicolon or brace close
-   if (  chunk_is_token(prev, CT_SEMICOLON)
-      || chunk_is_token(prev, CT_BRACE_CLOSE))
+   if (  prev->Is(CT_SEMICOLON)
+      || prev->Is(CT_BRACE_CLOSE))
    {
-      if (  chunk_is_newline(pc)
-         && pc->nl_count < 2)
+      if (  pc->IsNewline()
+         && pc->GetNlCount() < 2)
       {
          double_newline(pc);
       }
@@ -2699,7 +2756,7 @@ static void newline_case_colon(Chunk *start)
    } while (pc->IsComment());
 
    if (  pc->IsNotNullChunk()
-      && !chunk_is_newline(pc))
+      && !pc->IsNewline())
    {
       newline_add_before(pc);
    }
@@ -2719,10 +2776,10 @@ static void newline_before_return(Chunk *start)
    Chunk *nl = pc;
 
    // Skip over single preceding newline
-   if (chunk_is_newline(pc))
+   if (pc->IsNewline())
    {
       // Do we already have a blank line?
-      if (nl->nl_count > 1)
+      if (nl->GetNlCount() > 1)
       {
          return;
       }
@@ -2734,11 +2791,11 @@ static void newline_before_return(Chunk *start)
    // Trailing comments are considered part of the previous token, not the
    // return statement.  They are handled below.
    while (  pc->IsComment()
-         && get_chunk_parent_type(pc) != CT_COMMENT_END)
+         && pc->GetParentType() != CT_COMMENT_END)
    {
       pc = pc->GetPrev();
 
-      if (!chunk_is_newline(pc))
+      if (!pc->IsNewline())
       {
          return;
       }
@@ -2749,27 +2806,27 @@ static void newline_before_return(Chunk *start)
 
    // Peek over trailing comment of previous token
    if (  pc->IsComment()
-      && get_chunk_parent_type(pc) == CT_COMMENT_END)
+      && pc->GetParentType() == CT_COMMENT_END)
    {
       pc = pc->GetPrev();
    }
 
    // Don't add extra blanks after an opening brace or a case statement
-   if (  pc == nullptr
-      || (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_OPEN)
-         || chunk_is_token(pc, CT_CASE_COLON)))
+   if (  pc->IsNullChunk()
+      || (  pc->Is(CT_BRACE_OPEN)
+         || pc->Is(CT_VBRACE_OPEN)
+         || pc->Is(CT_CASE_COLON)))
    {
       return;
    }
 
-   if (  chunk_is_newline(nl)
-      && nl->nl_count < 2)
+   if (  nl->IsNewline()
+      && nl->GetNlCount() < 2)
    {
-      nl->nl_count++;
+      nl->SetNlCount(nl->GetNlCount() + 1);
       MARK_CHANGE();
-      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text is '%s', ++ nl_count is now %zu\n",
-              __func__, __LINE__, nl->orig_line, nl->orig_col, nl->Text(), nl->nl_count);
+      LOG_FMT(LBLANK, "%s(%d): orig line is %zu, orig col is %zu, text is '%s', new line count is now %zu\n",
+              __func__, __LINE__, nl->GetOrigLine(), nl->GetOrigCol(), nl->Text(), nl->GetNlCount());
    }
 } // newline_before_return
 
@@ -2778,14 +2835,13 @@ static void newline_after_return(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *semi  = start->GetNextType(CT_SEMICOLON, start->level);
+   Chunk *semi  = start->GetNextType(CT_SEMICOLON, start->GetLevel());
    Chunk *after = semi->GetNextNcNnlNet();
 
    // If we hit a brace or an 'else', then a newline isn't needed
    if (  after->IsNullChunk()
-      || chunk_is_token(after, CT_BRACE_CLOSE)
-      || chunk_is_token(after, CT_VBRACE_CLOSE)
-      || chunk_is_token(after, CT_ELSE))
+      || after->IsBraceClose()
+      || after->Is(CT_ELSE))
    {
       return;
    }
@@ -2793,9 +2849,9 @@ static void newline_after_return(Chunk *start)
 
    for (pc = semi->GetNext(); pc != after; pc = pc->GetNext())
    {
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
-         if (pc->nl_count < 2)
+         if (pc->GetNlCount() < 2)
          {
             double_newline(pc);
          }
@@ -2816,7 +2872,7 @@ static void newline_iarf_pair(Chunk *before, Chunk *after, iarf_e av, bool check
       || before == Chunk::NullChunkPtr
       || after == nullptr
       || after == Chunk::NullChunkPtr
-      || chunk_is_token(after, CT_IGNORED))
+      || after->Is(CT_IGNORED))
    {
       return;
    }
@@ -2825,7 +2881,7 @@ static void newline_iarf_pair(Chunk *before, Chunk *after, iarf_e av, bool check
    {
       if (  check_nl_assign_leave_one_liners
          && options::nl_assign_leave_one_liners()
-         && after->flags.test(PCF_ONE_LINER))
+         && after->TestFlags(PCF_ONE_LINER))
       {
          log_rule_B("nl_assign_leave_one_liners");
          return;
@@ -2836,9 +2892,9 @@ static void newline_iarf_pair(Chunk *before, Chunk *after, iarf_e av, bool check
 
       if (  nl != nullptr
          && av == IARF_FORCE
-         && nl->nl_count > 1)
+         && nl->GetNlCount() > 1)
       {
-         nl->nl_count = 1;
+         nl->SetNlCount(1);
       }
    }
    else if (av & IARF_REMOVE)
@@ -2863,9 +2919,9 @@ void newline_iarf(Chunk *pc, iarf_e av)
       after = pc->GetNextNnl();
    }
 
-   if (  chunk_is_token(pc, CT_FPAREN_OPEN)                         // Issue #2914
-      && get_chunk_parent_type(pc) == CT_FUNC_CALL
-      && chunk_is_token(after, CT_COMMENT_CPP)
+   if (  (pc != nullptr && pc->Is(CT_FPAREN_OPEN))                         // Issue #2914
+      && pc->GetParentType() == CT_FUNC_CALL
+      && after->Is(CT_COMMENT_CPP)
       && options::donot_add_nl_before_cpp_comment())
    {
       return;
@@ -2879,15 +2935,15 @@ static void newline_func_multi_line(Chunk *start)
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LNFD, "%s(%d): called on %zu:%zu '%s' [%s/%s]\n",
-           __func__, __LINE__, start->orig_line, start->orig_col,
-           start->Text(), get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol(),
+           start->Text(), get_token_name(start->GetType()), get_token_name(start->GetParentType()));
 
    bool add_start;
    bool add_args;
    bool add_end;
 
-   if (  get_chunk_parent_type(start) == CT_FUNC_DEF
-      || get_chunk_parent_type(start) == CT_FUNC_CLASS_DEF)
+   if (  start->GetParentType() == CT_FUNC_DEF
+      || start->GetParentType() == CT_FUNC_CLASS_DEF)
    {
       log_rule_B("nl_func_def_start_multi_line");
       add_start = options::nl_func_def_start_multi_line();
@@ -2896,8 +2952,8 @@ static void newline_func_multi_line(Chunk *start)
       log_rule_B("nl_func_def_end_multi_line");
       add_end = options::nl_func_def_end_multi_line();
    }
-   else if (  get_chunk_parent_type(start) == CT_FUNC_CALL
-           || get_chunk_parent_type(start) == CT_FUNC_CALL_USER)
+   else if (  start->GetParentType() == CT_FUNC_CALL
+           || start->GetParentType() == CT_FUNC_CALL_USER)
    {
       log_rule_B("nl_func_call_start_multi_line");
       add_start = options::nl_func_call_start_multi_line();
@@ -2925,26 +2981,26 @@ static void newline_func_multi_line(Chunk *start)
    Chunk *pc = start->GetNextNcNnl();
 
    while (  pc->IsNotNullChunk()
-         && pc->level > start->level)
+         && pc->GetLevel() > start->GetLevel())
    {
       pc = pc->GetNextNcNnl();
    }
 
-   if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-      && chunk_is_newline_between(start, pc))
+   if (  pc->Is(CT_FPAREN_CLOSE)
+      && start->IsNewlineBetween(pc))
    {
       Chunk *start_next         = start->GetNextNcNnl();
-      bool  has_leading_closure = (  start_next->parent_type == CT_OC_BLOCK_EXPR
-                                  || start_next->parent_type == CT_CPP_LAMBDA
-                                  || chunk_is_token(start_next, CT_BRACE_OPEN));
+      bool  has_leading_closure = (  start_next->GetParentType() == CT_OC_BLOCK_EXPR
+                                  || start_next->GetParentType() == CT_CPP_LAMBDA
+                                  || start_next->Is(CT_BRACE_OPEN));
 
       Chunk *prev_end            = pc->GetPrevNcNnl();
-      bool  has_trailing_closure = (  prev_end->parent_type == CT_OC_BLOCK_EXPR
-                                   || prev_end->parent_type == CT_CPP_LAMBDA
-                                   || chunk_is_token(prev_end, CT_BRACE_OPEN));
+      bool  has_trailing_closure = (  prev_end->GetParentType() == CT_OC_BLOCK_EXPR
+                                   || prev_end->GetParentType() == CT_CPP_LAMBDA
+                                   || prev_end->Is(CT_BRACE_OPEN));
 
       if (  add_start
-         && !chunk_is_newline(start->GetNext()))
+         && !start->GetNext()->IsNewline())
       {
          log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
@@ -2963,7 +3019,7 @@ static void newline_func_multi_line(Chunk *start)
       }
 
       if (  add_end
-         && !chunk_is_newline(pc->GetPrev()))
+         && !pc->GetPrev()->IsNewline())
       {
          log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
@@ -2986,11 +3042,11 @@ static void newline_func_multi_line(Chunk *start)
          // process the function in reverse and leave the first comma if the option to leave trailing closure
          // is on. nl_func_call_args_multi_line_ignore_trailing_closure
          for (pc = start->GetNextNcNnl();
-              pc->IsNotNullChunk() && pc->level > start->level;
+              pc->IsNotNullChunk() && pc->GetLevel() > start->GetLevel();
               pc = pc->GetNextNcNnl())
          {
-            if (  chunk_is_token(pc, CT_COMMA)
-               && (pc->level == (start->level + 1)))
+            if (  pc->Is(CT_COMMA)
+               && (pc->GetLevel() == (start->GetLevel() + 1)))
             {
                Chunk *tmp = pc->GetNext();
 
@@ -2999,7 +3055,7 @@ static void newline_func_multi_line(Chunk *start)
                   pc = tmp;
                }
 
-               if (!chunk_is_newline(pc->GetNext()))
+               if (!pc->GetNext()->IsNewline())
                {
                   log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
@@ -3008,12 +3064,12 @@ static void newline_func_multi_line(Chunk *start)
                      Chunk *prev_comma  = pc->GetPrevNcNnl();
                      Chunk *after_comma = pc->GetNextNcNnl();
 
-                     if (!(  (  prev_comma->parent_type == CT_OC_BLOCK_EXPR
-                             || prev_comma->parent_type == CT_CPP_LAMBDA
-                             || chunk_is_token(prev_comma, CT_BRACE_OPEN))
-                          || (  after_comma->parent_type == CT_OC_BLOCK_EXPR
-                             || after_comma->parent_type == CT_CPP_LAMBDA
-                             || chunk_is_token(after_comma, CT_BRACE_OPEN))))
+                     if (!(  (  prev_comma->GetParentType() == CT_OC_BLOCK_EXPR
+                             || prev_comma->GetParentType() == CT_CPP_LAMBDA
+                             || prev_comma->Is(CT_BRACE_OPEN))
+                          || (  after_comma->GetParentType() == CT_OC_BLOCK_EXPR
+                             || after_comma->GetParentType() == CT_CPP_LAMBDA
+                             || after_comma->Is(CT_BRACE_OPEN))))
                      {
                         newline_iarf(pc, IARF_ADD);
                      }
@@ -3035,8 +3091,8 @@ static void newline_template(Chunk *start)
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LNFD, "%s(%d): called on %zu:%zu '%s' [%s/%s]\n",
-           __func__, __LINE__, start->orig_line, start->orig_col,
-           start->Text(), get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol(),
+           start->Text(), get_token_name(start->GetType()), get_token_name(start->GetParentType()));
 
    log_rule_B("nl_template_start");
    bool add_start = options::nl_template_start();
@@ -3056,12 +3112,12 @@ static void newline_template(Chunk *start)
    Chunk *pc = start->GetNextNcNnl();
 
    while (  pc->IsNotNullChunk()
-         && pc->level > start->level)
+         && pc->GetLevel() > start->GetLevel())
    {
       pc = pc->GetNextNcNnl();
    }
 
-   if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+   if (pc->Is(CT_ANGLE_CLOSE))
    {
       if (add_start)
       {
@@ -3078,11 +3134,11 @@ static void newline_template(Chunk *start)
          Chunk *pc_1;
 
          for (pc_1 = start->GetNextNcNnl();
-              pc_1->IsNotNullChunk() && pc_1->level > start->level;
+              pc_1->IsNotNullChunk() && pc_1->GetLevel() > start->GetLevel();
               pc_1 = pc_1->GetNextNcNnl())
          {
-            if (  chunk_is_token(pc_1, CT_COMMA)
-               && (pc_1->level == (start->level + 1)))
+            if (  pc_1->Is(CT_COMMA)
+               && (pc_1->GetLevel() == (start->GetLevel() + 1)))
             {
                Chunk *tmp = pc_1->GetNext();
 
@@ -3091,7 +3147,7 @@ static void newline_template(Chunk *start)
                   pc_1 = tmp;
                }
 
-               if (!chunk_is_newline(pc_1->GetNext()))
+               if (!pc_1->GetNext()->IsNewline())
                {
                   newline_iarf(pc_1, IARF_ADD);
                }
@@ -3106,14 +3162,14 @@ static void newline_func_def_or_call(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LNFD, "%s(%d): called on start->Text() is '%s', orig_line is %zu, orig_col is %zu, [%s/%s]\n",
-           __func__, __LINE__, start->Text(), start->orig_line, start->orig_col,
-           get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
+   LOG_FMT(LNFD, "%s(%d): called on start->Text() is '%s', orig line is %zu, orig col is %zu, [%s/%s]\n",
+           __func__, __LINE__, start->Text(), start->GetOrigLine(), start->GetOrigCol(),
+           get_token_name(start->GetType()), get_token_name(start->GetParentType()));
 
-   bool is_def = (get_chunk_parent_type(start) == CT_FUNC_DEF)
-                 || get_chunk_parent_type(start) == CT_FUNC_CLASS_DEF;
-   bool is_call = (get_chunk_parent_type(start) == CT_FUNC_CALL)
-                  || get_chunk_parent_type(start) == CT_FUNC_CALL_USER;
+   bool is_def = (start->GetParentType() == CT_FUNC_DEF)
+                 || start->GetParentType() == CT_FUNC_CLASS_DEF;
+   bool is_call = (start->GetParentType() == CT_FUNC_CALL)
+                  || start->GetParentType() == CT_FUNC_CALL_USER;
 
    LOG_FMT(LNFD, "%s(%d): is_def is %s, is_call is %s\n",
            __func__, __LINE__, is_def ? "TRUE" : "FALSE", is_call ? "TRUE" : "FALSE");
@@ -3134,7 +3190,7 @@ static void newline_func_def_or_call(Chunk *start)
       }
       Chunk *pc = start->GetNextNcNnl();
 
-      if (chunk_is_str(pc, ")"))
+      if (pc->IsString(")"))
       {
          log_rule_B("nl_func_call_paren_empty");
          atmp = options::nl_func_call_paren_empty();
@@ -3183,21 +3239,21 @@ static void newline_func_def_or_call(Chunk *start)
       Chunk *prev = start->GetPrevNcNnlNi();   // Issue #2279
       prev = skip_template_prev(prev);
       // Don't split up a function variable
-      prev = chunk_is_paren_close(prev) ? nullptr : prev->GetPrevNcNnlNi();   // Issue #2279
+      prev = prev->IsParenClose() ? Chunk::NullChunkPtr : prev->GetPrevNcNnlNi();   // Issue #2279
 
       log_rule_B("nl_func_class_scope");
 
-      if (  chunk_is_token(prev, CT_DC_MEMBER)
+      if (  prev->Is(CT_DC_MEMBER)
          && (options::nl_func_class_scope() != IARF_IGNORE))
       {
          newline_iarf(prev->GetPrevNcNnlNi(), options::nl_func_class_scope());   // Issue #2279
       }
 
-      if (chunk_is_not_token(prev, CT_ACCESS_COLON))
+      if (prev->IsNot(CT_ACCESS_COLON))
       {
          Chunk *tmp;
 
-         if (chunk_is_token(prev, CT_OPERATOR))
+         if (prev->Is(CT_OPERATOR))
          {
             tmp  = prev;
             prev = prev->GetPrevNcNnlNi();   // Issue #2279
@@ -3207,26 +3263,26 @@ static void newline_func_def_or_call(Chunk *start)
             tmp = start;
          }
 
-         if (chunk_is_token(prev, CT_DC_MEMBER))
+         if (prev->Is(CT_DC_MEMBER))
          {
             log_rule_B("nl_func_scope_name");
 
             if (  options::nl_func_scope_name() != IARF_IGNORE
-               && !start->flags.test(PCF_IN_DECLTYPE))
+               && !start->TestFlags(PCF_IN_DECLTYPE))
             {
                newline_iarf(prev, options::nl_func_scope_name());
             }
          }
          const Chunk *tmp_next = prev->GetNextNcNnl();
 
-         if (chunk_is_not_token(tmp_next, CT_FUNC_CLASS_DEF))
+         if (tmp_next->IsNot(CT_FUNC_CLASS_DEF))
          {
-            Chunk  *closing = chunk_skip_to_match(tmp);
+            Chunk  *closing = tmp->GetClosingParen();
             Chunk  *brace   = closing->GetNextNcNnl();
             iarf_e a;                                            // Issue #2561
 
-            if (  get_chunk_parent_type(tmp) == CT_FUNC_PROTO
-               || get_chunk_parent_type(tmp) == CT_FUNC_CLASS_PROTO)
+            if (  tmp->GetParentType() == CT_FUNC_PROTO
+               || tmp->GetParentType() == CT_FUNC_CLASS_PROTO)
             {
                // proto
                log_rule_B("nl_func_proto_type_name");
@@ -3240,7 +3296,7 @@ static void newline_func_def_or_call(Chunk *start)
 
                if (  options::nl_func_leave_one_liners()
                   && (  brace == nullptr
-                     || brace->flags.test(PCF_ONE_LINER)))   // Issue #1511 and #3274
+                     || brace->TestFlags(PCF_ONE_LINER)))   // Issue #1511 and #3274
                {
                   a = IARF_IGNORE;
                }
@@ -3252,21 +3308,21 @@ static void newline_func_def_or_call(Chunk *start)
             }
             log_rule_B("nl_func_type_name_class");
 
-            if (  tmp->flags.test(PCF_IN_CLASS)
+            if (  tmp->TestFlags(PCF_IN_CLASS)
                && (options::nl_func_type_name_class() != IARF_IGNORE))
             {
                a = options::nl_func_type_name_class();
             }
 
-            if (  a != IARF_IGNORE
-               && prev != nullptr)
+            if (  (a != IARF_IGNORE)
+               && prev->IsNotNullChunk())
             {
-               LOG_FMT(LNFD, "%s(%d): prev->Text() '%s', orig_line is %zu, orig_col is %zu, [%s/%s]\n",
-                       __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col,
-                       get_token_name(prev->type),
-                       get_token_name(get_chunk_parent_type(prev)));
+               LOG_FMT(LNFD, "%s(%d): prev->Text() '%s', orig line is %zu, orig col is %zu, [%s/%s]\n",
+                       __func__, __LINE__, prev->Text(), prev->GetOrigLine(), prev->GetOrigCol(),
+                       get_token_name(prev->GetType()),
+                       get_token_name(prev->GetParentType()));
 
-               if (chunk_is_token(prev, CT_DESTRUCTOR))
+               if (prev->Is(CT_DESTRUCTOR))
                {
                   prev = prev->GetPrevNcNnlNi();   // Issue #2279
                }
@@ -3275,23 +3331,22 @@ static void newline_func_def_or_call(Chunk *start)
                 * If we are on a '::', step back two tokens
                 * TODO: do we also need to check for '.' ?
                 */
-               while (chunk_is_token(prev, CT_DC_MEMBER))
+               while (prev->Is(CT_DC_MEMBER))
                {
                   prev = prev->GetPrevNcNnlNi();   // Issue #2279
                   prev = skip_template_prev(prev);
                   prev = prev->GetPrevNcNnlNi();   // Issue #2279
                }
 
-               if (  chunk_is_not_token(prev, CT_BRACE_CLOSE)
-                  && chunk_is_not_token(prev, CT_VBRACE_CLOSE)
-                  && chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_SEMICOLON)
-                  && chunk_is_not_token(prev, CT_ACCESS_COLON)
+               if (  !prev->IsBraceClose()
+                  && prev->IsNot(CT_BRACE_OPEN)
+                  && prev->IsNot(CT_SEMICOLON)
+                  && prev->IsNot(CT_ACCESS_COLON)
                      // #1008: if we landed on an operator check that it is having
                      // a type before it, in order to not apply nl_func_type_name
                      // on conversion operators as they don't have a normal
                      // return type syntax
-                  && (chunk_is_not_token(tmp_next, CT_OPERATOR) ? true : chunk_is_type(prev)))
+                  && (tmp_next->IsNot(CT_OPERATOR) ? true : prev->IsTypeDefinition()))
                {
                   newline_iarf(prev, a);
                }
@@ -3300,7 +3355,7 @@ static void newline_func_def_or_call(Chunk *start)
       }
       Chunk *pc = start->GetNextNcNnl();
 
-      if (chunk_is_str(pc, ")"))
+      if (pc->IsString(")"))
       {
          log_rule_B("nl_func_def_empty");
          log_rule_B("nl_func_decl_empty");
@@ -3334,11 +3389,11 @@ static void newline_func_def_or_call(Chunk *start)
    Chunk  *pc;
 
    for (pc = start->GetNextNcNnl();
-        pc->IsNotNullChunk() && pc->level > start->level;
+        pc->IsNotNullChunk() && pc->GetLevel() > start->GetLevel();
         pc = pc->GetNextNcNnl())
    {
-      if (  chunk_is_token(pc, CT_COMMA)
-         && (pc->level == (start->level + 1)))
+      if (  pc->Is(CT_COMMA)
+         && (pc->GetLevel() == (start->GetLevel() + 1)))
       {
          comma_count++;
          tmp = pc->GetNext();
@@ -3359,7 +3414,7 @@ static void newline_func_def_or_call(Chunk *start)
             log_rule_B("nl_func_call_args");
             newline_iarf(pc, options::nl_func_call_args());
          }
-         else // get_chunk_parent_type(start) == CT_FUNC_DECL
+         else // start->GetParentType() == CT_FUNC_DECL
          {
             log_rule_B("nl_func_decl_args");
             newline_iarf(pc, options::nl_func_decl_args());
@@ -3404,11 +3459,11 @@ static void newline_func_def_or_call(Chunk *start)
    }
 
    // and fix up the close parenthesis
-   if (chunk_is_token(pc, CT_FPAREN_CLOSE))
+   if (pc->Is(CT_FPAREN_CLOSE))
    {
       Chunk *prev = pc->GetPrevNnl();
 
-      if (  chunk_is_not_token(prev, CT_FPAREN_OPEN)
+      if (  prev->IsNot(CT_FPAREN_OPEN)
          && !is_call)
       {
          newline_iarf(prev, ae);
@@ -3422,9 +3477,9 @@ static void newline_oc_msg(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *sq_c = chunk_skip_to_match(start);
+   Chunk *sq_c = start->GetClosingParen();
 
-   if (sq_c == nullptr)
+   if (sq_c->IsNullChunk())
    {
       return;
    }
@@ -3434,15 +3489,76 @@ static void newline_oc_msg(Chunk *start)
    {
       return;
    }
+   bool should_nl_msg = false;
+
+   // Get count of parameters
+   size_t parameter_count = 0;
+
+   for (Chunk *pc = start->GetNextNcNnl(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
+   {
+      if (pc->GetLevel() <= start->GetLevel())
+      {
+         break;
+      }
+
+      if (pc->Is(CT_OC_COLON) && pc->GetLevel() - 1 == start->GetLevel())
+      {
+         parameter_count++;
+      }
+   }
+
+   size_t min_params = options::nl_oc_msg_args_min_params();
+
+   if (  parameter_count >= min_params
+      && min_params != 0)
+   {
+      should_nl_msg = true;
+   }
+   // Get length of longest line
+   size_t longest_line = 0;
+
+   for (Chunk *pc = start->GetNextNcNnl(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
+   {
+      if (pc->GetLevel() <= start->GetLevel())
+      {
+         break;
+      }
+
+      if (pc->GetOrigColEnd() > longest_line)
+      {
+         longest_line = pc->GetOrigColEnd();
+      }
+   }
+
+   size_t max_code_width = options::nl_oc_msg_args_max_code_width();
+
+   if (  longest_line > max_code_width
+      && max_code_width != 0)
+   {
+      should_nl_msg = true;
+   }
+
+   // If both nl_oc_msg_args_min_params and nl_oc_msg_args_max_code_width are disabled
+   // we should newline all messages.
+   if (  max_code_width == 0
+      && min_params == 0)
+   {
+      should_nl_msg = true;
+   }
+
+   if (!should_nl_msg)
+   {
+      return;
+   }
 
    for (Chunk *pc = start->GetNextNcNnl(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (pc->level <= start->level)
+      if (pc->GetLevel() <= start->GetLevel())
       {
          break;
       }
 
-      if (chunk_is_token(pc, CT_OC_MSG_NAME))
+      if (pc->Is(CT_OC_MSG_NAME) && pc->GetLevel() - 1 == start->GetLevel())
       {
          newline_add_before(pc);
       }
@@ -3454,11 +3570,11 @@ static bool one_liner_nl_ok(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LNL1LINE, "%s(%d): check type is %s, parent is %s, flag is %s, orig_line is %zu, orig_col is %zu\n",
-           __func__, __LINE__, get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           pcf_flags_str(pc->flags).c_str(), pc->orig_line, pc->orig_col);
+   LOG_FMT(LNL1LINE, "%s(%d): check type is %s, parent is %s, flag is %s, orig line is %zu, orig col is %zu\n",
+           __func__, __LINE__, get_token_name(pc->GetType()), get_token_name(pc->GetParentType()),
+           pcf_flags_str(pc->GetFlags()).c_str(), pc->GetOrigLine(), pc->GetOrigCol());
 
-   if (!pc->flags.test(PCF_ONE_LINER))
+   if (!pc->TestFlags(PCF_ONE_LINER))
    {
       LOG_FMT(LNL1LINE, "%s(%d): true (not 1-liner), a new line may be added\n", __func__, __LINE__);
       return(true);
@@ -3466,17 +3582,17 @@ static bool one_liner_nl_ok(Chunk *pc)
    // Step back to find the opening brace
    Chunk *br_open = pc;
 
-   if (chunk_is_closing_brace(br_open))
+   if (br_open->IsBraceClose())
    {
-      br_open = br_open->GetPrevType(chunk_is_token(br_open, CT_BRACE_CLOSE) ? CT_BRACE_OPEN : CT_VBRACE_OPEN,
-                                     br_open->level, E_Scope::ALL);
+      br_open = br_open->GetPrevType(br_open->Is(CT_BRACE_CLOSE) ? CT_BRACE_OPEN : CT_VBRACE_OPEN,
+                                     br_open->GetLevel(), E_Scope::ALL);
    }
    else
    {
       while (  br_open->IsNotNullChunk()
-            && br_open->flags.test(PCF_ONE_LINER)
-            && !chunk_is_opening_brace(br_open)
-            && !chunk_is_closing_brace(br_open))
+            && br_open->TestFlags(PCF_ONE_LINER)
+            && !br_open->IsBraceOpen()
+            && !br_open->IsBraceClose())
       {
          br_open = br_open->GetPrev();
       }
@@ -3484,16 +3600,14 @@ static bool one_liner_nl_ok(Chunk *pc)
    pc = br_open;
 
    if (  pc->IsNotNullChunk()
-      && pc->flags.test(PCF_ONE_LINER)
-      && (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE)))
+      && pc->TestFlags(PCF_ONE_LINER)
+      && (  pc->IsBraceOpen()
+         || pc->IsBraceClose()))
    {
       log_rule_B("nl_class_leave_one_liners");
 
       if (  options::nl_class_leave_one_liners()
-         && pc->flags.test(PCF_IN_CLASS))
+         && pc->TestFlags(PCF_IN_CLASS))
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (class)\n", __func__, __LINE__);
          return(false);
@@ -3501,7 +3615,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_assign_leave_one_liners");
 
       if (  options::nl_assign_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_ASSIGN)
+         && pc->GetParentType() == CT_ASSIGN)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (assign)\n", __func__, __LINE__);
          return(false);
@@ -3509,7 +3623,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_enum_leave_one_liners");
 
       if (  options::nl_enum_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_ENUM)
+         && pc->GetParentType() == CT_ENUM)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (enum)\n", __func__, __LINE__);
          return(false);
@@ -3517,7 +3631,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_getset_leave_one_liners");
 
       if (  options::nl_getset_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_GETSET)
+         && pc->GetParentType() == CT_GETSET)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (get/set), a new line may NOT be added\n", __func__, __LINE__);
          return(false);
@@ -3526,7 +3640,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_cs_property_leave_one_liners");
 
       if (  options::nl_cs_property_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_CS_PROPERTY)
+         && pc->GetParentType() == CT_CS_PROPERTY)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (c# property), a new line may NOT be added\n", __func__, __LINE__);
          return(false);
@@ -3534,8 +3648,8 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_func_leave_one_liners");
 
       if (  options::nl_func_leave_one_liners()
-         && (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-            || get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF))
+         && (  pc->GetParentType() == CT_FUNC_DEF
+            || pc->GetParentType() == CT_FUNC_CLASS_DEF))
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (func def)\n", __func__, __LINE__);
          return(false);
@@ -3543,7 +3657,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_func_leave_one_liners");
 
       if (  options::nl_func_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_OC_MSG_DECL)
+         && pc->GetParentType() == CT_OC_MSG_DECL)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (method def)\n", __func__, __LINE__);
          return(false);
@@ -3551,7 +3665,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_cpp_lambda_leave_one_liners");
 
       if (  options::nl_cpp_lambda_leave_one_liners()
-         && ((get_chunk_parent_type(pc) == CT_CPP_LAMBDA)))
+         && ((pc->GetParentType() == CT_CPP_LAMBDA)))
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (lambda)\n", __func__, __LINE__);
          return(false);
@@ -3559,7 +3673,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_oc_msg_leave_one_liner");
 
       if (  options::nl_oc_msg_leave_one_liner()
-         && pc->flags.test(PCF_IN_OC_MSG))
+         && pc->TestFlags(PCF_IN_OC_MSG))
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (message)\n", __func__, __LINE__);
          return(false);
@@ -3567,9 +3681,9 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_if_leave_one_liners");
 
       if (  options::nl_if_leave_one_liners()
-         && (  get_chunk_parent_type(pc) == CT_IF
-            || get_chunk_parent_type(pc) == CT_ELSEIF
-            || get_chunk_parent_type(pc) == CT_ELSE))
+         && (  pc->GetParentType() == CT_IF
+            || pc->GetParentType() == CT_ELSEIF
+            || pc->GetParentType() == CT_ELSE))
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (if/else)\n", __func__, __LINE__);
          return(false);
@@ -3577,7 +3691,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_while_leave_one_liners");
 
       if (  options::nl_while_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_WHILE)
+         && pc->GetParentType() == CT_WHILE)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (while)\n", __func__, __LINE__);
          return(false);
@@ -3585,7 +3699,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_do_leave_one_liners");
 
       if (  options::nl_do_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_DO)
+         && pc->GetParentType() == CT_DO)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (do)\n", __func__, __LINE__);
          return(false);
@@ -3593,7 +3707,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_for_leave_one_liners");
 
       if (  options::nl_for_leave_one_liners()
-         && get_chunk_parent_type(pc) == CT_FOR)
+         && pc->GetParentType() == CT_FOR)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (for)\n", __func__, __LINE__);
          return(false);
@@ -3601,7 +3715,7 @@ static bool one_liner_nl_ok(Chunk *pc)
       log_rule_B("nl_namespace_two_to_one_liner - 2");
 
       if (  options::nl_namespace_two_to_one_liner()
-         && get_chunk_parent_type(pc) == CT_NAMESPACE)
+         && pc->GetParentType() == CT_NAMESPACE)
       {
          LOG_FMT(LNL1LINE, "%s(%d): false (namespace)\n", __func__, __LINE__);
          return(false);
@@ -3617,11 +3731,11 @@ void undo_one_liner(Chunk *pc)
    LOG_FUNC_ENTRY();
 
    if (  pc != nullptr
-      && pc->flags.test(PCF_ONE_LINER))
+      && pc->TestFlags(PCF_ONE_LINER))
    {
-      LOG_FMT(LNL1LINE, "%s(%d): pc->Text() '%s', orig_line is %zu, orig_col is %zu",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
-      chunk_flags_clr(pc, PCF_ONE_LINER);
+      LOG_FMT(LNL1LINE, "%s(%d): pc->Text() '%s', orig line is %zu, orig col is %zu",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+      pc->ResetFlagBits(PCF_ONE_LINER);
 
       // scan backward
       LOG_FMT(LNL1LINE, "%s(%d): scan backward\n", __func__, __LINE__);
@@ -3629,15 +3743,15 @@ void undo_one_liner(Chunk *pc)
 
       while ((tmp = tmp->GetPrev())->IsNotNullChunk())
       {
-         if (!tmp->flags.test(PCF_ONE_LINER))
+         if (!tmp->TestFlags(PCF_ONE_LINER))
          {
-            LOG_FMT(LNL1LINE, "%s(%d): tmp->Text() '%s', orig_line is %zu, orig_col is %zu, --> break\n",
-                    __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col);
+            LOG_FMT(LNL1LINE, "%s(%d): tmp->Text() '%s', orig line is %zu, orig col is %zu, --> break\n",
+                    __func__, __LINE__, tmp->Text(), tmp->GetOrigLine(), tmp->GetOrigCol());
             break;
          }
-         LOG_FMT(LNL1LINE, "%s(%d): clear for tmp->Text() '%s', orig_line is %zu, orig_col is %zu",
-                 __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col);
-         chunk_flags_clr(tmp, PCF_ONE_LINER);
+         LOG_FMT(LNL1LINE, "%s(%d): clear for tmp->Text() '%s', orig line is %zu, orig col is %zu",
+                 __func__, __LINE__, tmp->Text(), tmp->GetOrigLine(), tmp->GetOrigCol());
+         tmp->ResetFlagBits(PCF_ONE_LINER);
       }
       // scan forward
       LOG_FMT(LNL1LINE, "%s(%d): scan forward\n", __func__, __LINE__);
@@ -3646,15 +3760,15 @@ void undo_one_liner(Chunk *pc)
 
       while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
-         if (!tmp->flags.test(PCF_ONE_LINER))
+         if (!tmp->TestFlags(PCF_ONE_LINER))
          {
-            LOG_FMT(LNL1LINE, "%s(%d): tmp->Text() '%s', orig_line is %zu, orig_col is %zu, --> break\n",
-                    __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col);
+            LOG_FMT(LNL1LINE, "%s(%d): tmp->Text() '%s', orig line is %zu, orig col is %zu, --> break\n",
+                    __func__, __LINE__, tmp->Text(), tmp->GetOrigLine(), tmp->GetOrigCol());
             break;
          }
-         LOG_FMT(LNL1LINE, "%s(%d): clear for tmp->Text() '%s', orig_line is %zu, orig_col is %zu",
-                 __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col);
-         chunk_flags_clr(tmp, PCF_ONE_LINER);
+         LOG_FMT(LNL1LINE, "%s(%d): clear for tmp->Text() '%s', orig line is %zu, orig col is %zu",
+                 __func__, __LINE__, tmp->Text(), tmp->GetOrigLine(), tmp->GetOrigCol());
+         tmp->ResetFlagBits(PCF_ONE_LINER);
       }
       LOG_FMT(LNL1LINE, "\n");
    }
@@ -3670,17 +3784,17 @@ static void nl_create_one_liner(Chunk *vbrace_open)
    Chunk *first = tmp;
 
    if (  first->IsNullChunk()
-      || get_token_pattern_class(first->type) != pattern_class_e::NONE)
+      || get_token_pattern_class(first->GetType()) != pattern_class_e::NONE)
    {
       return;
    }
    size_t nl_total = 0;
 
-   while (chunk_is_not_token(tmp, CT_VBRACE_CLOSE))
+   while (tmp->IsNot(CT_VBRACE_CLOSE))
    {
-      if (chunk_is_newline(tmp))
+      if (tmp->IsNewline())
       {
-         nl_total += tmp->nl_count;
+         nl_total += tmp->GetNlCount();
 
          if (nl_total > 1)
          {
@@ -3691,7 +3805,7 @@ static void nl_create_one_liner(Chunk *vbrace_open)
    }
 
    if (  tmp->IsNotNullChunk()
-      && first != nullptr)
+      && first->IsNotNullChunk())
    {
       newline_del_between(vbrace_open, first);
    }
@@ -3707,12 +3821,12 @@ static void nl_create_list_liner(Chunk *brace_open)
    {
       return;
    }
-   Chunk *closing = brace_open->GetNextType(CT_BRACE_CLOSE, brace_open->level);
+   Chunk *closing = brace_open->GetNextType(CT_BRACE_CLOSE, brace_open->GetLevel());
    Chunk *tmp     = brace_open;
 
    do
    {
-      if (chunk_is_token(tmp, CT_COMMA))
+      if (tmp->Is(CT_COMMA))
       {
          return;
       }
@@ -3723,14 +3837,14 @@ static void nl_create_list_liner(Chunk *brace_open)
 } // nl_create_list_liner
 
 
-void newlines_remove_newlines(void)
+void newlines_remove_newlines()
 {
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LBLANK, "%s(%d):\n", __func__, __LINE__);
    Chunk *pc = Chunk::GetHead();
 
-   if (!chunk_is_newline(pc))
+   if (!pc->IsNewline())
    {
       pc = pc->GetNextNl();
    }
@@ -3740,7 +3854,7 @@ void newlines_remove_newlines(void)
    while (pc->IsNotNullChunk())
    {
       // Remove all newlines not in preproc
-      if (!pc->flags.test(PCF_IN_PREPROC))
+      if (!pc->TestFlags(PCF_IN_PREPROC))
       {
          next = pc->GetNext();
          prev = pc->GetPrev();
@@ -3752,7 +3866,7 @@ void newlines_remove_newlines(void)
             continue;
          }
          else if (  prev->IsNotNullChunk()
-                 && !chunk_is_newline(prev->GetNext()))
+                 && !prev->GetNext()->IsNewline())
          {
             pc = prev;
          }
@@ -3771,21 +3885,21 @@ void newlines_remove_disallowed()
 
    while ((pc = pc->GetNextNl())->IsNotNullChunk())
    {
-      LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
+      LOG_FMT(LBLANKD, "%s(%d): orig line is %zu, orig col is %zu, <Newline>, nl is %zu\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetNlCount());
 
       next = pc->GetNext();
 
       if (  next->IsNotNullChunk()
-         && !chunk_is_token(next, CT_NEWLINE)
+         && !next->Is(CT_NEWLINE)
          && !can_increase_nl(pc))
       {
-         LOG_FMT(LBLANKD, "%s(%d): force to 1 orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+         LOG_FMT(LBLANKD, "%s(%d): force to 1 orig line is %zu, orig col is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
 
-         if (pc->nl_count != 1)
+         if (pc->GetNlCount() != 1)
          {
-            pc->nl_count = 1;
+            pc->SetNlCount(1);
             MARK_CHANGE();
          }
       }
@@ -3801,10 +3915,10 @@ void newlines_cleanup_angles()
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       char copy[1000];
-      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy));
+      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));
 
-      if (chunk_is_token(pc, CT_ANGLE_OPEN))
+      if (pc->Is(CT_ANGLE_OPEN))
       {
          newline_template(pc);
       }
@@ -3814,29 +3928,31 @@ void newlines_cleanup_angles()
 
 void newlines_cleanup_braces(bool first)
 {
+//prot_the_line(__func__, __LINE__, 15, 4);
    LOG_FUNC_ENTRY();
 
    // Get the first token that's not an empty line:
    Chunk *pc = Chunk::GetHead();
 
-   if (chunk_is_newline(pc))
+   if (pc->IsNewline())
    {
       pc = pc->GetNextNcNnl();
    }
 
    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->orig_line, pc->orig_col, pc->ElidedText(copy));
+      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));
 
-      if (  chunk_is_token(pc, CT_IF)
-         || chunk_is_token(pc, CT_CONSTEXPR))
+      if (  pc->Is(CT_IF)
+         || pc->Is(CT_CONSTEXPR))
       {
          log_rule_B("nl_if_brace");
          newlines_if_for_while_switch(pc, options::nl_if_brace());
       }
-      else if (chunk_is_token(pc, CT_ELSEIF))
+      else if (pc->Is(CT_ELSEIF))
       {
          log_rule_B("nl_elseif_brace");
          iarf_e arg = options::nl_elseif_brace();
@@ -3844,17 +3960,17 @@ void newlines_cleanup_braces(bool first)
          newlines_if_for_while_switch(
             pc, (arg != IARF_IGNORE) ? arg : options::nl_if_brace());
       }
-      else if (chunk_is_token(pc, CT_FOR))
+      else if (pc->Is(CT_FOR))
       {
          log_rule_B("nl_for_brace");
          newlines_if_for_while_switch(pc, options::nl_for_brace());
       }
-      else if (chunk_is_token(pc, CT_CATCH))
+      else if (pc->Is(CT_CATCH))
       {
          log_rule_B("nl_oc_brace_catch");
 
          if (  language_is_set(LANG_OC)
-            && (pc->str[0] == '@')
+            && (pc->GetStr()[0] == '@')
             && (options::nl_oc_brace_catch() != IARF_IGNORE))
          {
             newlines_cuddle_uncuddle(pc, options::nl_oc_brace_catch());
@@ -3866,7 +3982,7 @@ void newlines_cleanup_braces(bool first)
          }
          Chunk *next = pc->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_BRACE_OPEN))
+         if (next->Is(CT_BRACE_OPEN))
          {
             log_rule_B("nl_oc_catch_brace");
 
@@ -3898,53 +4014,53 @@ void newlines_cleanup_braces(bool first)
             }
          }
       }
-      else if (chunk_is_token(pc, CT_WHILE))
+      else if (pc->Is(CT_WHILE))
       {
          log_rule_B("nl_while_brace");
          newlines_if_for_while_switch(pc, options::nl_while_brace());
       }
-      else if (chunk_is_token(pc, CT_USING_STMT))
+      else if (pc->Is(CT_USING_STMT))
       {
          log_rule_B("nl_using_brace");
          newlines_if_for_while_switch(pc, options::nl_using_brace());
       }
-      else if (chunk_is_token(pc, CT_D_SCOPE_IF))
+      else if (pc->Is(CT_D_SCOPE_IF))
       {
          log_rule_B("nl_scope_brace");
          newlines_if_for_while_switch(pc, options::nl_scope_brace());
       }
-      else if (chunk_is_token(pc, CT_UNITTEST))
+      else if (pc->Is(CT_UNITTEST))
       {
          log_rule_B("nl_unittest_brace");
          newlines_do_else(pc, options::nl_unittest_brace());
       }
-      else if (chunk_is_token(pc, CT_D_VERSION_IF))
+      else if (pc->Is(CT_D_VERSION_IF))
       {
          log_rule_B("nl_version_brace");
          newlines_if_for_while_switch(pc, options::nl_version_brace());
       }
-      else if (chunk_is_token(pc, CT_SWITCH))
+      else if (pc->Is(CT_SWITCH))
       {
          log_rule_B("nl_switch_brace");
          newlines_if_for_while_switch(pc, options::nl_switch_brace());
       }
-      else if (chunk_is_token(pc, CT_SYNCHRONIZED))
+      else if (pc->Is(CT_SYNCHRONIZED))
       {
          log_rule_B("nl_synchronized_brace");
          newlines_if_for_while_switch(pc, options::nl_synchronized_brace());
       }
-      else if (chunk_is_token(pc, CT_DO))
+      else if (pc->Is(CT_DO))
       {
          log_rule_B("nl_do_brace");
          newlines_do_else(pc, options::nl_do_brace());
       }
-      else if (chunk_is_token(pc, CT_ELSE))
+      else if (pc->Is(CT_ELSE))
       {
          log_rule_B("nl_brace_else");
          newlines_cuddle_uncuddle(pc, options::nl_brace_else());
          Chunk *next = pc->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_ELSEIF))
+         if (next->Is(CT_ELSEIF))
          {
             log_rule_B("nl_else_if");
             newline_iarf_pair(pc, next, options::nl_else_if());
@@ -3952,34 +4068,34 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_else_brace");
          newlines_do_else(pc, options::nl_else_brace());
       }
-      else if (chunk_is_token(pc, CT_TRY))
+      else if (pc->Is(CT_TRY))
       {
          log_rule_B("nl_try_brace");
          newlines_do_else(pc, options::nl_try_brace());
          // Issue #1734
          Chunk *po = pc->GetNextNcNnl();
-         flag_parens(po, PCF_IN_TRY_BLOCK, po->type, CT_NONE, false);
+         flag_parens(po, PCF_IN_TRY_BLOCK, po->GetType(), CT_NONE, false);
       }
-      else if (chunk_is_token(pc, CT_GETSET))
+      else if (pc->Is(CT_GETSET))
       {
          log_rule_B("nl_getset_brace");
          newlines_do_else(pc, options::nl_getset_brace());
       }
-      else if (chunk_is_token(pc, CT_FINALLY))
+      else if (pc->Is(CT_FINALLY))
       {
          log_rule_B("nl_brace_finally");
          newlines_cuddle_uncuddle(pc, options::nl_brace_finally());
          log_rule_B("nl_finally_brace");
          newlines_do_else(pc, options::nl_finally_brace());
       }
-      else if (chunk_is_token(pc, CT_WHILE_OF_DO))
+      else if (pc->Is(CT_WHILE_OF_DO))
       {
          log_rule_B("nl_brace_while");
          newlines_cuddle_uncuddle(pc, options::nl_brace_while());
       }
-      else if (chunk_is_token(pc, CT_BRACE_OPEN))
+      else if (pc->Is(CT_BRACE_OPEN))
       {
-         switch (get_chunk_parent_type(pc))
+         switch (pc->GetParentType())
          {
          case CT_DOUBLE_BRACE:
          {
@@ -3987,9 +4103,9 @@ void newlines_cleanup_braces(bool first)
 
             if (options::nl_paren_dbrace_open() != IARF_IGNORE)
             {
-               Chunk *prev = pc->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
+               Chunk *prev = pc->GetPrevNcNnlNi(E_Scope::PREPROC);    // Issue #2279
 
-               if (chunk_is_paren_close(prev))
+               if (prev->IsParenClose())
                {
                   log_rule_B("nl_paren_dbrace_open");
                   newline_iarf_pair(prev, pc, options::nl_paren_dbrace_open());
@@ -4029,9 +4145,10 @@ void newlines_cleanup_braces(bool first)
 
          case CT_CLASS:
          {
-            if (pc->level == pc->brace_level)
+            if (pc->GetLevel() == pc->GetBraceLevel())
             {
                log_rule_B("nl_class_brace");
+               log_ruleNL("nl_class_brace", pc->GetPrevNnl());
                newlines_do_else(pc->GetPrevNnl(), options::nl_class_brace());
             }
             break;
@@ -4039,23 +4156,23 @@ void newlines_cleanup_braces(bool first)
 
          case CT_OC_CLASS:
          {
-            if (pc->level == pc->brace_level)
+            if (pc->GetLevel() == pc->GetBraceLevel())
             {
                // Request #126
                // introduce two new options
                // look back if we have a @interface or a @implementation
                for (Chunk *tmp = pc->GetPrev(); tmp->IsNotNullChunk(); tmp = tmp->GetPrev())
                {
-                  LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                          __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
+                  LOG_FMT(LBLANK, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                          __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
 
-                  if (  chunk_is_token(tmp, CT_OC_INTF)
-                     || chunk_is_token(tmp, CT_OC_IMPL))
+                  if (  tmp->Is(CT_OC_INTF)
+                     || tmp->Is(CT_OC_IMPL))
                   {
-                     LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, may be remove/force newline before {\n",
-                             __func__, __LINE__, pc->orig_line, pc->orig_col);
+                     LOG_FMT(LBLANK, "%s(%d): orig line is %zu, orig col is %zu, may be remove/force newline before {\n",
+                             __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
 
-                     if (chunk_is_token(tmp, CT_OC_INTF))
+                     if (tmp->Is(CT_OC_INTF))
                      {
                         log_rule_B("nl_oc_interface_brace");
                         newlines_do_else(pc->GetPrevNnl(), options::nl_oc_interface_brace());
@@ -4085,11 +4202,11 @@ void newlines_cleanup_braces(bool first)
             Chunk *prev = pc->GetPrevNnl();
 
             if (  prev->IsNotNullChunk()
-               && (  prev->type == CT_TYPE
-                  || prev->type == CT_WORD
-                  || prev->type == CT_ASSIGN                      // Issue #2957
-                  || prev->parent_type == CT_TEMPLATE
-                  || prev->parent_type == CT_DECLTYPE))
+               && (  prev->GetType() == CT_TYPE
+                  || prev->GetType() == CT_WORD
+                  || prev->GetType() == CT_ASSIGN                      // Issue #2957
+                  || prev->GetParentType() == CT_TEMPLATE
+                  || prev->GetParentType() == CT_DECLTYPE))
             {
                log_rule_B("nl_type_brace_init_lst");
                newline_iarf_pair(prev, pc, options::nl_type_brace_init_lst(), true);
@@ -4135,7 +4252,7 @@ void newlines_cleanup_braces(bool first)
          {
             Chunk *next = pc->GetNextNc(E_Scope::PREPROC);
 
-            if (chunk_is_token(next, CT_BRACE_OPEN))
+            if (next->Is(CT_BRACE_OPEN))
             {
                newline_iarf_pair(pc, next, options::nl_brace_brace());
             }
@@ -4146,11 +4263,11 @@ void newlines_cleanup_braces(bool first)
          {
             // do nothing
          }
-         else if (chunk_is_token(next, CT_BRACE_CLOSE))
+         else if (next->Is(CT_BRACE_CLOSE))
          {
             // TODO: add an option to split open empty statements? { };
          }
-         else if (chunk_is_token(next, CT_BRACE_OPEN))
+         else if (next->Is(CT_BRACE_OPEN))
          {
             // already handled
          }
@@ -4159,15 +4276,15 @@ void newlines_cleanup_braces(bool first)
             next = pc->GetNextNcNnl();
 
             // Handle unnamed temporary direct-list-initialization
-            if (get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)
+            if (pc->GetParentType() == CT_BRACED_INIT_LIST)
             {
                log_rule_B("nl_type_brace_init_lst_open");
                newline_iarf_pair(pc, pc->GetNextNnl(),
                                  options::nl_type_brace_init_lst_open(), true);
             }
             // Handle nl_after_brace_open
-            else if (  (  get_chunk_parent_type(pc) == CT_CPP_LAMBDA
-                       || pc->level == pc->brace_level)
+            else if (  (  pc->GetParentType() == CT_CPP_LAMBDA
+                       || pc->GetLevel() == pc->GetBraceLevel())
                     && options::nl_after_brace_open())
             {
                log_rule_B("nl_after_brace_open");
@@ -4177,8 +4294,8 @@ 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->flags.test(PCF_IN_ARRAY_ASSIGN)
-                       || pc->flags.test(PCF_IN_PREPROC))
+               else if (  pc->TestFlags(PCF_IN_ARRAY_ASSIGN)
+                       || pc->TestFlags(PCF_IN_PREPROC))
                {
                   // no change - don't break up array assignments or preprocessors
                }
@@ -4194,7 +4311,7 @@ void newlines_cleanup_braces(bool first)
                         log_rule_B("nl_after_brace_open_cmt");
 
                         if (  !options::nl_after_brace_open_cmt()
-                           && chunk_is_not_token(tmp, CT_COMMENT_MULTI))
+                           && tmp->IsNot(CT_COMMENT_MULTI))
                         {
                            break;
                         }
@@ -4212,7 +4329,7 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_type_brace_init_lst_open");
          log_rule_B("nl_type_brace_init_lst_close");
 
-         if (!(  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
+         if (!(  pc->GetParentType() == CT_BRACED_INIT_LIST
               && options::nl_type_brace_init_lst_open() == IARF_IGNORE
               && options::nl_type_brace_init_lst_close() == IARF_IGNORE))
          {
@@ -4220,8 +4337,8 @@ void newlines_cleanup_braces(bool first)
          }
 
          // Handle nl_before_brace_open
-         if (  chunk_is_token(pc, CT_BRACE_OPEN)
-            && pc->level == pc->brace_level
+         if (  pc->Is(CT_BRACE_OPEN)
+            && pc->GetLevel() == pc->GetBraceLevel()
             && options::nl_before_brace_open())
          {
             log_rule_B("nl_before_brace_open");
@@ -4231,8 +4348,8 @@ void newlines_cleanup_braces(bool first)
                LOG_FMT(LNL1LINE, "a new line may NOT be added (nl_before_brace_open)\n");
                // no change - preserve one liner body
             }
-            else if (  pc->flags.test(PCF_IN_PREPROC)
-                    || pc->flags.test(PCF_IN_ARRAY_ASSIGN))
+            else if (  pc->TestFlags(PCF_IN_PREPROC)
+                    || pc->TestFlags(PCF_IN_ARRAY_ASSIGN))
             {
                // no change - don't break up array assignments or preprocessors
             }
@@ -4241,14 +4358,14 @@ void newlines_cleanup_braces(bool first)
                // Step back to previous non-newline item
                Chunk *tmp = pc->GetPrev();
 
-               if (!chunk_is_token(tmp, CT_NEWLINE))
+               if (!tmp->Is(CT_NEWLINE))
                {
                   newline_iarf(tmp, IARF_ADD);
                }
             }
          }
       }
-      else if (chunk_is_token(pc, CT_BRACE_CLOSE))
+      else if (pc->Is(CT_BRACE_CLOSE))
       {
          // newline between a close brace and x
          log_rule_B("nl_brace_brace");
@@ -4257,7 +4374,7 @@ void newlines_cleanup_braces(bool first)
          {
             Chunk *next = pc->GetNextNc(E_Scope::PREPROC);
 
-            if (chunk_is_token(next, CT_BRACE_CLOSE))
+            if (next->Is(CT_BRACE_CLOSE))
             {
                log_rule_B("nl_brace_brace");
                newline_iarf_pair(pc, next, options::nl_brace_brace());
@@ -4269,7 +4386,7 @@ void newlines_cleanup_braces(bool first)
          {
             Chunk *next = pc->GetNextNc(E_Scope::PREPROC);
 
-            if (chunk_is_token(next, CT_SQUARE_CLOSE))
+            if (next->Is(CT_SQUARE_CLOSE))
             {
                log_rule_B("nl_brace_square");
                newline_iarf_pair(pc, next, options::nl_brace_square());
@@ -4283,13 +4400,13 @@ void newlines_cleanup_braces(bool first)
 
             log_rule_B("nl_brace_fparen");
 
-            if (  chunk_is_token(next, CT_NEWLINE)
+            if (  next->Is(CT_NEWLINE)
                && (options::nl_brace_fparen() == IARF_REMOVE))
             {
                next = next->GetNextNc(E_Scope::PREPROC);  // Issue #1000
             }
 
-            if (chunk_is_token(next, CT_FPAREN_CLOSE))
+            if (next->Is(CT_FPAREN_CLOSE))
             {
                log_rule_B("nl_brace_fparen");
                newline_iarf_pair(pc, next, options::nl_brace_fparen());
@@ -4298,7 +4415,7 @@ void newlines_cleanup_braces(bool first)
          // newline before a close brace
          log_rule_B("nl_type_brace_init_lst_close");
 
-         if (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
+         if (  pc->GetParentType() == CT_BRACED_INIT_LIST
             && options::nl_type_brace_init_lst_close() != IARF_IGNORE)
          {
             // Handle unnamed temporary direct-list-initialization
@@ -4313,50 +4430,50 @@ void newlines_cleanup_braces(bool first)
             // Limit the newlines before the close brace to 1
             Chunk *prev = pc->GetPrev();
 
-            if (chunk_is_newline(prev))
+            if (prev->IsNewline())
             {
                log_rule_B("nl_inside_namespace");
                log_rule_B("nl_inside_empty_func");
 
                if (  options::nl_inside_empty_func() > 0
-                  && chunk_is_token(pc->GetPrevNnl(), CT_BRACE_OPEN)
-                  && (  get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                     || get_chunk_parent_type(pc) == CT_FUNC_DEF))
+                  && pc->GetPrevNnl()->Is(CT_BRACE_OPEN)
+                  && (  pc->GetParentType() == CT_FUNC_CLASS_DEF
+                     || pc->GetParentType() == CT_FUNC_DEF))
                {
                   blank_line_set(prev, options::nl_inside_empty_func);
                }
                else if (  options::nl_inside_namespace() > 0
-                       && get_chunk_parent_type(pc) == CT_NAMESPACE)
+                       && pc->GetParentType() == CT_NAMESPACE)
                {
                   blank_line_set(prev, options::nl_inside_namespace);
                }
-               else if (prev->nl_count != 1)
+               else if (prev->GetNlCount() != 1)
                {
-                  prev->nl_count = 1;
+                  prev->SetNlCount(1);
                   LOG_FMT(LBLANKD, "%s(%d): eat_blanks_before_close_brace %zu\n",
-                          __func__, __LINE__, prev->orig_line);
+                          __func__, __LINE__, prev->GetOrigLine());
                   MARK_CHANGE();
                }
             }
          }
          else if (  options::nl_ds_struct_enum_close_brace()
-                 && (  get_chunk_parent_type(pc) == CT_ENUM
-                    || get_chunk_parent_type(pc) == CT_STRUCT
-                    || get_chunk_parent_type(pc) == CT_UNION))
+                 && (  pc->GetParentType() == CT_ENUM
+                    || pc->GetParentType() == CT_STRUCT
+                    || pc->GetParentType() == CT_UNION))
          {
             log_rule_B("nl_ds_struct_enum_close_brace");
 
-            if (!pc->flags.test(PCF_ONE_LINER))
+            if (!pc->TestFlags(PCF_ONE_LINER))
             {
                // Make sure the brace is preceded by two newlines
                Chunk *prev = pc->GetPrev();
 
-               if (!chunk_is_newline(prev))
+               if (!prev->IsNewline())
                {
                   prev = newline_add_before(pc);
                }
 
-               if (prev->nl_count < 2)
+               if (prev->GetNlCount() < 2)
                {
                   double_newline(prev);
                }
@@ -4366,50 +4483,50 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_brace_struct_var");
 
          if (  (options::nl_brace_struct_var() != IARF_IGNORE)
-            && (  get_chunk_parent_type(pc) == CT_STRUCT
-               || get_chunk_parent_type(pc) == CT_ENUM
-               || get_chunk_parent_type(pc) == CT_UNION))
+            && (  pc->GetParentType() == CT_STRUCT
+               || pc->GetParentType() == CT_ENUM
+               || pc->GetParentType() == CT_UNION))
          {
             Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-            if (  chunk_is_not_token(next, CT_SEMICOLON)
-               && chunk_is_not_token(next, CT_COMMA))
+            if (  next->IsNot(CT_SEMICOLON)
+               && next->IsNot(CT_COMMA))
             {
                log_rule_B("nl_brace_struct_var");
                newline_iarf(pc, options::nl_brace_struct_var());
             }
          }
-         else if (  get_chunk_parent_type(pc) != CT_OC_AT
-                 && get_chunk_parent_type(pc) != CT_BRACED_INIT_LIST
+         else if (  pc->GetParentType() != CT_OC_AT
+                 && pc->GetParentType() != CT_BRACED_INIT_LIST
                  && (  options::nl_after_brace_close()
-                    || get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                    || get_chunk_parent_type(pc) == CT_FUNC_DEF
-                    || get_chunk_parent_type(pc) == CT_OC_MSG_DECL))
+                    || pc->GetParentType() == CT_FUNC_CLASS_DEF
+                    || pc->GetParentType() == CT_FUNC_DEF
+                    || pc->GetParentType() == CT_OC_MSG_DECL))
          {
             log_rule_B("nl_after_brace_close");
             Chunk *next = pc->GetNext();
 
-            if (  chunk_is_not_token(next, CT_SEMICOLON)
-               && chunk_is_not_token(next, CT_COMMA)
-               && chunk_is_not_token(next, CT_SPAREN_CLOSE)    // Issue #664
-               && chunk_is_not_token(next, CT_SQUARE_CLOSE)
-               && chunk_is_not_token(next, CT_FPAREN_CLOSE)
-               && chunk_is_not_token(next, CT_PAREN_CLOSE)
-               && chunk_is_not_token(next, CT_WHILE_OF_DO)
-               && chunk_is_not_token(next, CT_VBRACE_CLOSE) // Issue #666
-               && (  chunk_is_not_token(next, CT_BRACE_CLOSE)
-                  || !next->flags.test(PCF_ONE_LINER))      // #1258
-               && !pc->flags.test(PCF_IN_ARRAY_ASSIGN)
-               && !pc->flags.test(PCF_IN_TYPEDEF)
-               && !chunk_is_newline(next)
-               && !next->IsComment())
+            if (  next->IsNot(CT_SEMICOLON)
+               && next->IsNot(CT_COMMA)
+               && next->IsNot(CT_SPAREN_CLOSE)    // Issue #664
+               && next->IsNot(CT_SQUARE_CLOSE)
+               && next->IsNot(CT_FPAREN_CLOSE)
+               && next->IsNot(CT_PAREN_CLOSE)
+               && next->IsNot(CT_WHILE_OF_DO)
+               && next->IsNot(CT_VBRACE_CLOSE)        // Issue #666
+               && (  next->IsNot(CT_BRACE_CLOSE)
+                  || !next->TestFlags(PCF_ONE_LINER)) // #1258
+               && !pc->TestFlags(PCF_IN_ARRAY_ASSIGN)
+               && !pc->TestFlags(PCF_IN_TYPEDEF)
+               && !next->IsCommentOrNewline()
+               && next->IsNotNullChunk())
             {
                // #1258
                // dont add newline between two consecutive braces closes, if the second is a part of one liner.
                newline_end_newline(pc);
             }
          }
-         else if (get_chunk_parent_type(pc) == CT_NAMESPACE)
+         else if (pc->GetParentType() == CT_NAMESPACE)
          {
             log_rule_B("nl_after_namespace");
 
@@ -4425,7 +4542,7 @@ void newlines_cleanup_braces(bool first)
             }
          }
       }
-      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
+      else if (pc->Is(CT_VBRACE_OPEN))
       {
          log_rule_B("nl_after_vbrace_open");
          log_rule_B("nl_after_vbrace_open_empty");
@@ -4436,7 +4553,7 @@ void newlines_cleanup_braces(bool first)
             Chunk *next = pc->GetNext(E_Scope::PREPROC);
             bool  add_it;
 
-            if (chunk_is_semicolon(next))
+            if (next->IsSemicolon())
             {
                log_rule_B("nl_after_vbrace_open_empty");
                add_it = options::nl_after_vbrace_open_empty();
@@ -4445,9 +4562,8 @@ void newlines_cleanup_braces(bool first)
             {
                log_rule_B("nl_after_vbrace_open");
                add_it = (  options::nl_after_vbrace_open()
-                        && chunk_is_not_token(next, CT_VBRACE_CLOSE)
-                        && !next->IsComment()
-                        && !chunk_is_newline(next));
+                        && next->IsNot(CT_VBRACE_CLOSE)
+                        && !next->IsCommentOrNewline());
             }
 
             if (add_it)
@@ -4459,13 +4575,13 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_create_for_one_liner");
          log_rule_B("nl_create_while_one_liner");
 
-         if (  (  (  get_chunk_parent_type(pc) == CT_IF
-                  || get_chunk_parent_type(pc) == CT_ELSEIF
-                  || get_chunk_parent_type(pc) == CT_ELSE)
+         if (  (  (  pc->GetParentType() == CT_IF
+                  || pc->GetParentType() == CT_ELSEIF
+                  || pc->GetParentType() == CT_ELSE)
                && options::nl_create_if_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_FOR
+            || (  pc->GetParentType() == CT_FOR
                && options::nl_create_for_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_WHILE
+            || (  pc->GetParentType() == CT_WHILE
                && options::nl_create_while_one_liner()))
          {
             nl_create_one_liner(pc);
@@ -4474,19 +4590,19 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_split_for_one_liner");
          log_rule_B("nl_split_while_one_liner");
 
-         if (  (  (  get_chunk_parent_type(pc) == CT_IF
-                  || get_chunk_parent_type(pc) == CT_ELSEIF
-                  || get_chunk_parent_type(pc) == CT_ELSE)
+         if (  (  (  pc->GetParentType() == CT_IF
+                  || pc->GetParentType() == CT_ELSEIF
+                  || pc->GetParentType() == CT_ELSE)
                && options::nl_split_if_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_FOR
+            || (  pc->GetParentType() == CT_FOR
                && options::nl_split_for_one_liner())
-            || (  get_chunk_parent_type(pc) == CT_WHILE
+            || (  pc->GetParentType() == CT_WHILE
                && options::nl_split_while_one_liner()))
          {
-            if (pc->flags.test(PCF_ONE_LINER))
+            if (pc->TestFlags(PCF_ONE_LINER))
             {
                // split one-liner
-               Chunk *end = pc->GetNext()->GetNextType(CT_SEMICOLON, -1)->GetNext();
+               Chunk *end = pc->GetNext()->GetNextType(CT_SEMICOLON)->GetNext();
                // Scan for clear flag
                LOG_FMT(LNEWLINE, "(%d) ", __LINE__);
                LOG_FMT(LNEWLINE, "\n");
@@ -4494,31 +4610,31 @@ void newlines_cleanup_braces(bool first)
                for (Chunk *temp = pc; temp != end; temp = temp->GetNext())
                {
                   LOG_FMT(LNEWLINE, "%s(%d): Text() is '%s', type is %s, level is %zu\n",
-                          __func__, __LINE__, temp->Text(), get_token_name(temp->type), temp->level);
+                          __func__, __LINE__, temp->Text(), get_token_name(temp->GetType()), temp->GetLevel());
                   // produces much more log output. Use it only debugging purpose
-                  //log_pcf_flags(LNEWLINE, temp->flags);
-                  chunk_flags_clr(temp, PCF_ONE_LINER);
+                  //log_pcf_flags(LNEWLINE, temp->GetFlags());
+                  temp->ResetFlagBits(PCF_ONE_LINER);
                }
 
                // split
-               newline_add_between(pc, pc->next);
+               newline_add_between(pc, pc->GetNext());
             }
          }
       }
-      else if (chunk_is_token(pc, CT_VBRACE_CLOSE))
+      else if (pc->Is(CT_VBRACE_CLOSE))
       {
          log_rule_B("nl_after_vbrace_close");
 
          if (options::nl_after_vbrace_close())
          {
-            if (!chunk_is_newline(pc->GetNextNc()))
+            if (!pc->GetNextNc()->IsNewline())
             {
                newline_iarf(pc, IARF_ADD);
             }
          }
       }
-      else if (  chunk_is_token(pc, CT_SQUARE_OPEN)
-              && get_chunk_parent_type(pc) == CT_OC_MSG)
+      else if (  pc->Is(CT_SQUARE_OPEN)
+              && pc->GetParentType() == CT_OC_MSG)
       {
          log_rule_B("nl_oc_msg_args");
 
@@ -4527,21 +4643,21 @@ void newlines_cleanup_braces(bool first)
             newline_oc_msg(pc);
          }
       }
-      else if (chunk_is_token(pc, CT_STRUCT))
+      else if (pc->Is(CT_STRUCT))
       {
          log_rule_B("nl_struct_brace");
          newlines_struct_union(pc, options::nl_struct_brace(), true);
       }
-      else if (chunk_is_token(pc, CT_UNION))
+      else if (pc->Is(CT_UNION))
       {
          log_rule_B("nl_union_brace");
          newlines_struct_union(pc, options::nl_union_brace(), true);
       }
-      else if (chunk_is_token(pc, CT_ENUM))
+      else if (pc->Is(CT_ENUM))
       {
          newlines_enum(pc);
       }
-      else if (chunk_is_token(pc, CT_CASE))
+      else if (pc->Is(CT_CASE))
       {
          // Note: 'default' also maps to CT_CASE
          log_rule_B("nl_before_case");
@@ -4551,36 +4667,36 @@ void newlines_cleanup_braces(bool first)
             newline_case(pc);
          }
       }
-      else if (chunk_is_token(pc, CT_THROW))
+      else if (pc->Is(CT_THROW))
       {
          Chunk *prev = pc->GetPrev();
 
-         if (  chunk_is_token(prev, CT_PAREN_CLOSE)
-            || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
+         if (  prev->Is(CT_PAREN_CLOSE)
+            || prev->Is(CT_FPAREN_CLOSE))         // Issue #1122
          {
             log_rule_B("nl_before_throw");
             newline_iarf(pc->GetPrevNcNnlNi(), options::nl_before_throw());   // Issue #2279
          }
       }
-      else if (  chunk_is_token(pc, CT_QUALIFIER)
+      else if (  pc->Is(CT_QUALIFIER)
               && !strcmp(pc->Text(), "throws"))
       {
          Chunk *prev = pc->GetPrev();
 
-         if (  chunk_is_token(prev, CT_PAREN_CLOSE)
-            || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
+         if (  prev->Is(CT_PAREN_CLOSE)
+            || prev->Is(CT_FPAREN_CLOSE))         // Issue #1122
          {
             log_rule_B("nl_before_throw");
             newline_iarf(pc->GetPrevNcNnlNi(), options::nl_before_throw());   // Issue #2279
          }
       }
-      else if (chunk_is_token(pc, CT_CASE_COLON))
+      else if (pc->Is(CT_CASE_COLON))
       {
          Chunk *next = pc->GetNextNnl();
 
          log_rule_B("nl_case_colon_brace");
 
-         if (  chunk_is_token(next, CT_BRACE_OPEN)
+         if (  next->Is(CT_BRACE_OPEN)
             && options::nl_case_colon_brace() != IARF_IGNORE)
          {
             newline_iarf(pc, options::nl_case_colon_brace());
@@ -4591,11 +4707,11 @@ void newlines_cleanup_braces(bool first)
             newline_case_colon(pc);
          }
       }
-      else if (chunk_is_token(pc, CT_SPAREN_CLOSE))
+      else if (pc->Is(CT_SPAREN_CLOSE))
       {
          Chunk *next = pc->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_BRACE_OPEN))
+         if (next->Is(CT_BRACE_OPEN))
          {
             /*
              * TODO: this could be used to control newlines between the
@@ -4604,7 +4720,7 @@ void newlines_cleanup_braces(bool first)
              */
          }
       }
-      else if (chunk_is_token(pc, CT_RETURN))
+      else if (pc->Is(CT_RETURN))
       {
          log_rule_B("nl_before_return");
 
@@ -4619,24 +4735,24 @@ void newlines_cleanup_braces(bool first)
             newline_after_return(pc);
          }
       }
-      else if (chunk_is_token(pc, CT_SEMICOLON))
+      else if (pc->Is(CT_SEMICOLON))
       {
          log_rule_B("nl_after_semicolon");
+         log_rule_NL("nl_after_semicolon");
 
-         if (  !pc->flags.test(PCF_IN_SPAREN)
-            && !pc->flags.test(PCF_IN_PREPROC)
+         if (  !pc->TestFlags(PCF_IN_SPAREN)
+            && !pc->TestFlags(PCF_IN_PREPROC)
             && options::nl_after_semicolon())
          {
             Chunk *next = pc->GetNext();
 
-            while (chunk_is_token(next, CT_VBRACE_CLOSE))
+            while (next->Is(CT_VBRACE_CLOSE))
             {
                next = next->GetNext();
             }
 
             if (  next->IsNotNullChunk()
-               && !next->IsComment()
-               && !chunk_is_newline(next))
+               && !next->IsCommentOrNewline())
             {
                if (one_liner_nl_ok(next))
                {
@@ -4649,17 +4765,35 @@ void newlines_cleanup_braces(bool first)
                }
             }
          }
-         else if (get_chunk_parent_type(pc) == CT_CLASS)
+         else if (pc->GetParentType() == CT_CLASS)
          {
             log_rule_B("nl_after_class");
 
             if (options::nl_after_class() > 0)
             {
-               newline_iarf(pc, IARF_ADD);
+               /*
+                * If there is already a "class" comment, then don't add a newline if
+                * one exists after the comment. or else this will interfere with the
+                * mod_add_long_class_closebrace_comment option.
+                */
+               iarf_e mode  = IARF_ADD;
+               Chunk  *next = pc->GetNext();
+
+               if (next->IsComment())
+               {
+                  pc   = next;
+                  next = pc->GetNext();
+
+                  if (next->IsNewline())
+                  {
+                     mode = IARF_IGNORE;
+                  }
+               }
+               newline_iarf(pc, mode);
             }
          }
       }
-      else if (chunk_is_token(pc, CT_FPAREN_OPEN))
+      else if (pc->Is(CT_FPAREN_OPEN))
       {
          log_rule_B("nl_func_decl_start");
          log_rule_B("nl_func_def_start");
@@ -4688,58 +4822,49 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_func_def_paren");
          log_rule_B("nl_func_def_paren_empty");
          log_rule_B("nl_func_paren_empty");
-         log_rule_B("nl_func_call_args");
-
-         if (  (  (  get_chunk_parent_type(pc) == CT_FUNC_DEF
-                  || get_chunk_parent_type(pc) == CT_FUNC_PROTO
-                  || get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
-                  || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO
-                  || get_chunk_parent_type(pc) == CT_OPERATOR)
-               && (  options::nl_func_decl_start() != IARF_IGNORE
-                  || options::nl_func_def_start() != IARF_IGNORE
-                  || options::nl_func_decl_start_single() != IARF_IGNORE
-                  || options::nl_func_def_start_single() != IARF_IGNORE
-                  || options::nl_func_decl_start_multi_line()
-                  || options::nl_func_def_start_multi_line()
-                  || options::nl_func_decl_args() != IARF_IGNORE
-                  || options::nl_func_def_args() != IARF_IGNORE
-                  || options::nl_func_decl_args_multi_line()
-                  || options::nl_func_def_args_multi_line()
-                  || options::nl_func_decl_end() != IARF_IGNORE
-                  || options::nl_func_def_end() != IARF_IGNORE
-                  || options::nl_func_decl_end_single() != IARF_IGNORE
-                  || options::nl_func_def_end_single() != IARF_IGNORE
-                  || options::nl_func_decl_end_multi_line()
-                  || options::nl_func_def_end_multi_line()
-                  || options::nl_func_decl_empty() != IARF_IGNORE
-                  || options::nl_func_def_empty() != IARF_IGNORE
-                  || options::nl_func_type_name() != IARF_IGNORE
-                  || options::nl_func_type_name_class() != IARF_IGNORE
-                  || options::nl_func_class_scope() != IARF_IGNORE
-                  || options::nl_func_scope_name() != IARF_IGNORE
-                  || options::nl_func_proto_type_name() != IARF_IGNORE
-                  || options::nl_func_paren() != IARF_IGNORE
-                  || options::nl_func_def_paren() != IARF_IGNORE
-                  || options::nl_func_def_paren_empty() != IARF_IGNORE
-                  || options::nl_func_paren_empty() != IARF_IGNORE))
-
-            || (  get_chunk_parent_type(pc) == CT_FUNC_CALL                // Issue #2604
-               && options::nl_func_call_args() != IARF_IGNORE))
+
+         if (  (  pc->GetParentType() == CT_FUNC_DEF
+               || pc->GetParentType() == CT_FUNC_PROTO
+               || pc->GetParentType() == CT_FUNC_CLASS_DEF
+               || pc->GetParentType() == CT_FUNC_CLASS_PROTO
+               || pc->GetParentType() == CT_OPERATOR)
+            && (  options::nl_func_decl_start() != IARF_IGNORE
+               || options::nl_func_def_start() != IARF_IGNORE
+               || options::nl_func_decl_start_single() != IARF_IGNORE
+               || options::nl_func_def_start_single() != IARF_IGNORE
+               || options::nl_func_decl_start_multi_line()
+               || options::nl_func_def_start_multi_line()
+               || options::nl_func_decl_args() != IARF_IGNORE
+               || options::nl_func_def_args() != IARF_IGNORE
+               || options::nl_func_decl_args_multi_line()
+               || options::nl_func_def_args_multi_line()
+               || options::nl_func_decl_end() != IARF_IGNORE
+               || options::nl_func_def_end() != IARF_IGNORE
+               || options::nl_func_decl_end_single() != IARF_IGNORE
+               || options::nl_func_def_end_single() != IARF_IGNORE
+               || options::nl_func_decl_end_multi_line()
+               || options::nl_func_def_end_multi_line()
+               || options::nl_func_decl_empty() != IARF_IGNORE
+               || options::nl_func_def_empty() != IARF_IGNORE
+               || options::nl_func_type_name() != IARF_IGNORE
+               || options::nl_func_type_name_class() != IARF_IGNORE
+               || options::nl_func_class_scope() != IARF_IGNORE
+               || options::nl_func_scope_name() != IARF_IGNORE
+               || options::nl_func_proto_type_name() != IARF_IGNORE
+               || options::nl_func_paren() != IARF_IGNORE
+               || options::nl_func_def_paren() != IARF_IGNORE
+               || options::nl_func_def_paren_empty() != IARF_IGNORE
+               || options::nl_func_paren_empty() != IARF_IGNORE))
          {
             newline_func_def_or_call(pc);
          }
-         else if (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL                // Issue #2020
-                    || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
-                 && options::nl_func_call_start() != IARF_IGNORE)
-         {
-            log_rule_B("nl_func_call_start");
-            newline_iarf(pc, options::nl_func_call_start());
-         }
-         else if (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-                    || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
+         else if (  (  pc->GetParentType() == CT_FUNC_CALL
+                    || pc->GetParentType() == CT_FUNC_CALL_USER)
                  && (  (options::nl_func_call_start_multi_line())
                     || (options::nl_func_call_args_multi_line())
                     || (options::nl_func_call_end_multi_line())
+                    || (options::nl_func_call_start() != IARF_IGNORE)        // Issue #2020
+                    || (options::nl_func_call_args() != IARF_IGNORE)         // Issue #2604
                     || (options::nl_func_call_paren() != IARF_IGNORE)
                     || (options::nl_func_call_paren_empty() != IARF_IGNORE)
                     || (options::nl_func_call_empty() != IARF_IGNORE)))
@@ -4747,17 +4872,18 @@ void newlines_cleanup_braces(bool first)
             log_rule_B("nl_func_call_start_multi_line");
             log_rule_B("nl_func_call_args_multi_line");
             log_rule_B("nl_func_call_end_multi_line");
+            log_rule_B("nl_func_call_start");
+            log_rule_B("nl_func_call_args");
             log_rule_B("nl_func_call_paren");
             log_rule_B("nl_func_call_paren_empty");
             log_rule_B("nl_func_call_empty");
 
-            if (  options::nl_func_call_paren() != IARF_IGNORE
-               || options::nl_func_call_paren_empty() != IARF_IGNORE
-               || options::nl_func_call_empty() != IARF_IGNORE)
+            if (options::nl_func_call_start() != IARF_IGNORE)
             {
-               newline_func_def_or_call(pc);
+               newline_iarf(pc, options::nl_func_call_start());
             }
-            newline_func_multi_line(pc);
+            // note that newline_func_def_or_call() calls newline_func_multi_line()
+            newline_func_def_or_call(pc);
          }
          else if (  first
                  && (options::nl_remove_extra_newlines() == 1))
@@ -4766,35 +4892,35 @@ void newlines_cleanup_braces(bool first)
             newline_iarf(pc, IARF_REMOVE);
          }
       }
-      else if (chunk_is_token(pc, CT_FPAREN_CLOSE))                          // Issue #2758
+      else if (pc->Is(CT_FPAREN_CLOSE))                          // Issue #2758
       {
-         if (  (  get_chunk_parent_type(pc) == CT_FUNC_CALL
-               || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER)
+         if (  (  pc->GetParentType() == CT_FUNC_CALL
+               || pc->GetParentType() == CT_FUNC_CALL_USER)
             && options::nl_func_call_end() != IARF_IGNORE)
          {
             log_rule_B("nl_func_call_end");
-            newline_iarf(pc->prev, options::nl_func_call_end());
+            newline_iarf(pc->GetPrev(), options::nl_func_call_end());
          }
       }
-      else if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+      else if (pc->Is(CT_ANGLE_CLOSE))
       {
-         if (get_chunk_parent_type(pc) == CT_TEMPLATE)
+         if (pc->GetParentType() == CT_TEMPLATE)
          {
             Chunk *next = pc->GetNextNcNnl();
 
             if (  next->IsNotNullChunk()
-               && next->level == next->brace_level)
+               && next->GetLevel() == next->GetBraceLevel())
             {
-               Chunk *tmp = pc->GetPrevType(CT_ANGLE_OPEN, pc->level)->GetPrevNcNnlNi();   // Issue #2279
+               Chunk *tmp = pc->GetPrevType(CT_ANGLE_OPEN, pc->GetLevel())->GetPrevNcNnlNi();   // Issue #2279
 
-               if (chunk_is_token(tmp, CT_TEMPLATE))
+               if (tmp->Is(CT_TEMPLATE))
                {
-                  if (chunk_is_token(next, CT_USING))
+                  if (next->Is(CT_USING))
                   {
                      newline_iarf(pc, options::nl_template_using());
                      log_rule_B("nl_template_using");
                   }
-                  else if (get_chunk_parent_type(next) == CT_FUNC_DEF) // function definition
+                  else if (next->GetParentType() == CT_FUNC_DEF) // function definition
                   {
                      iarf_e const action =
                         newline_template_option(
@@ -4807,7 +4933,7 @@ void newlines_cleanup_braces(bool first)
                      log_rule_B("nl_template_func");
                      newline_iarf(pc, action);
                   }
-                  else if (get_chunk_parent_type(next) == CT_FUNC_PROTO) // function declaration
+                  else if (next->GetParentType() == CT_FUNC_PROTO) // function declaration
                   {
                      iarf_e const action =
                         newline_template_option(
@@ -4820,13 +4946,13 @@ void newlines_cleanup_braces(bool first)
                      log_rule_B("nl_template_func");
                      newline_iarf(pc, action);
                   }
-                  else if (  chunk_is_token(next, CT_TYPE)
-                          || chunk_is_token(next, CT_QUALIFIER)) // variable
+                  else if (  next->Is(CT_TYPE)
+                          || next->Is(CT_QUALIFIER)) // variable
                   {
                      newline_iarf(pc, options::nl_template_var());
                      log_rule_B("nl_template_var");
                   }
-                  else if (next->flags.test(PCF_INCOMPLETE)) // class declaration
+                  else if (next->TestFlags(PCF_INCOMPLETE)) // class declaration
                   {
                      iarf_e const action =
                         newline_template_option(
@@ -4856,8 +4982,8 @@ void newlines_cleanup_braces(bool first)
             }
          }
       }
-      else if (  chunk_is_token(pc, CT_NAMESPACE)
-              && get_chunk_parent_type(pc) != CT_USING)
+      else if (  pc->Is(CT_NAMESPACE)
+              && pc->GetParentType() != CT_USING)
       {
          // Issue #2387
          Chunk *next = pc->GetNextNcNnl();
@@ -4866,31 +4992,31 @@ void newlines_cleanup_braces(bool first)
          {
             next = next->GetNextNcNnl();
 
-            if (!chunk_is_token(next, CT_ASSIGN))
+            if (!next->Is(CT_ASSIGN))
             {
                // Issue #1235
                // Issue #2186
-               Chunk *braceOpen = pc->GetNextType(CT_BRACE_OPEN, pc->level);
+               Chunk *braceOpen = pc->GetNextType(CT_BRACE_OPEN, pc->GetLevel());
 
                if (braceOpen->IsNullChunk())
                {
                   // fatal error
-                  LOG_FMT(LERR, "%s(%d): Missing BRACE_OPEN after namespace\n   orig_line is %zu, orig_col is %zu\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col);
+                  LOG_FMT(LERR, "%s(%d): Missing BRACE_OPEN after namespace\n   orig line is %zu, orig col is %zu\n",
+                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                   exit(EXIT_FAILURE);
                }
-               LOG_FMT(LNEWLINE, "%s(%d): braceOpen->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                       __func__, __LINE__, braceOpen->orig_line, braceOpen->orig_col, braceOpen->Text());
+               LOG_FMT(LNEWLINE, "%s(%d): braceOpen orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                       __func__, __LINE__, braceOpen->GetOrigLine(), braceOpen->GetOrigCol(), braceOpen->Text());
                // produces much more log output. Use it only debugging purpose
-               //log_pcf_flags(LNEWLINE, braceOpen->flags);
+               //log_pcf_flags(LNEWLINE, braceOpen->GetFlags());
                newlines_namespace(pc);
             }
          }
       }
-      else if (chunk_is_token(pc, CT_SQUARE_OPEN))
+      else if (pc->Is(CT_SQUARE_OPEN))
       {
-         if (  get_chunk_parent_type(pc) == CT_ASSIGN
-            && !pc->flags.test(PCF_ONE_LINER))
+         if (  pc->GetParentType() == CT_ASSIGN
+            && !pc->TestFlags(PCF_ONE_LINER))
          {
             Chunk *tmp = pc->GetPrevNcNnlNi();   // Issue #2279
             newline_iarf(tmp, options::nl_assign_square());
@@ -4912,9 +5038,9 @@ void newlines_cleanup_braces(bool first)
              */
             tmp = pc->GetNextNc();
 
-            if (chunk_is_newline(tmp))
+            if (tmp->IsNewline())
             {
-               tmp = pc->GetNextType(CT_SQUARE_CLOSE, pc->level);
+               tmp = pc->GetNextType(CT_SQUARE_CLOSE, pc->GetLevel());
 
                if (tmp->IsNotNullChunk())
                {
@@ -4923,7 +5049,7 @@ void newlines_cleanup_braces(bool first)
             }
          }
       }
-      else if (chunk_is_token(pc, CT_ACCESS))
+      else if (pc->Is(CT_ACCESS))
       {
          // Make sure there is a newline before an access spec
          if (options::nl_before_access_spec() > 0)
@@ -4931,13 +5057,13 @@ void newlines_cleanup_braces(bool first)
             log_rule_B("nl_before_access_spec");
             Chunk *prev = pc->GetPrev();
 
-            if (!chunk_is_newline(prev))
+            if (!prev->IsNewline())
             {
                newline_add_before(pc);
             }
          }
       }
-      else if (chunk_is_token(pc, CT_ACCESS_COLON))
+      else if (pc->Is(CT_ACCESS_COLON))
       {
          // Make sure there is a newline after an access spec
          if (options::nl_after_access_spec() > 0)
@@ -4945,13 +5071,13 @@ void newlines_cleanup_braces(bool first)
             log_rule_B("nl_after_access_spec");
             Chunk *next = pc->GetNext();
 
-            if (!chunk_is_newline(next))
+            if (!next->IsNewline())
             {
                newline_add_before(next);
             }
          }
       }
-      else if (chunk_is_token(pc, CT_PP_DEFINE))
+      else if (pc->Is(CT_PP_DEFINE))
       {
          if (options::nl_multi_line_define())
          {
@@ -4961,17 +5087,18 @@ void newlines_cleanup_braces(bool first)
       }
       else if (  first
               && (options::nl_remove_extra_newlines() == 1)
-              && !pc->flags.test(PCF_IN_PREPROC))
+              && !pc->TestFlags(PCF_IN_PREPROC))
       {
          log_rule_B("nl_remove_extra_newlines");
+         log_rule_NL("nl_remove_extra_newlines");
          newline_iarf(pc, IARF_REMOVE);
       }
-      else if (  chunk_is_token(pc, CT_MEMBER)
+      else if (  pc->Is(CT_MEMBER)
               && (  language_is_set(LANG_JAVA)
                  || language_is_set(LANG_CPP)))                 // Issue #2574
       {
          // Issue #1124
-         if (pc->parent_type != CT_FUNC_DEF)
+         if (pc->GetParentType() != CT_FUNC_DEF)
          {
             newline_iarf(pc->GetPrevNnl(), options::nl_before_member());
             log_rule_B("nl_before_member");
@@ -4985,7 +5112,9 @@ void newlines_cleanup_braces(bool first)
       }
    }
 
-   newline_def_blk(Chunk::GetHead(), false);
+//prot_the_line(__func__, __LINE__, 15, 4);
+   newline_var_def_blk(Chunk::GetHead());
+//prot_the_line(__func__, __LINE__, 15, 4);
 } // newlines_cleanup_braces
 
 
@@ -4998,19 +5127,19 @@ static void nl_handle_define(Chunk *pc)
 
    while ((nl = nl->GetNext())->IsNotNullChunk())
    {
-      if (chunk_is_token(nl, CT_NEWLINE))
+      if (nl->Is(CT_NEWLINE))
       {
          return;
       }
 
-      if (  chunk_is_token(nl, CT_MACRO)
-         || (  chunk_is_token(nl, CT_FPAREN_CLOSE)
-            && get_chunk_parent_type(nl) == CT_MACRO_FUNC))
+      if (  nl->Is(CT_MACRO)
+         || (  nl->Is(CT_FPAREN_CLOSE)
+            && nl->GetParentType() == CT_MACRO_FUNC))
       {
          ref = nl;
       }
 
-      if (chunk_is_token(nl, CT_NL_CONT))
+      if (nl->Is(CT_NL_CONT))
       {
          if (ref->IsNotNullChunk())
          {
@@ -5022,20 +5151,20 @@ static void nl_handle_define(Chunk *pc)
 } // nl_handle_define
 
 
-void newline_after_multiline_comment(void)
+void newline_after_multiline_comment()
 {
    LOG_FUNC_ENTRY();
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (chunk_is_not_token(pc, CT_COMMENT_MULTI))
+      if (pc->IsNot(CT_COMMENT_MULTI))
       {
          continue;
       }
       Chunk *tmp = pc;
 
       while (  ((tmp = tmp->GetNext())->IsNotNullChunk())
-            && !chunk_is_newline(tmp))
+            && !tmp->IsNewline())
       {
          if (!tmp->IsComment())
          {
@@ -5047,13 +5176,13 @@ void newline_after_multiline_comment(void)
 } // newline_after_multiline_comment
 
 
-void newline_after_label_colon(void)
+void newline_after_label_colon()
 {
    LOG_FUNC_ENTRY();
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (chunk_is_not_token(pc, CT_LABEL_COLON))
+      if (pc->IsNot(CT_LABEL_COLON))
       {
          continue;
       }
@@ -5064,88 +5193,88 @@ void newline_after_label_colon(void)
 
 static bool is_class_one_liner(Chunk *pc)
 {
-   if (  (  chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-         || chunk_is_token(pc, CT_FUNC_DEF))
-      && pc->flags.test(PCF_IN_CLASS))
+   if (  (  pc->Is(CT_FUNC_CLASS_DEF)
+         || pc->Is(CT_FUNC_DEF))
+      && pc->TestFlags(PCF_IN_CLASS))
    {
       // Find opening brace
-      pc = pc->GetNextType(CT_BRACE_OPEN, pc->level);
+      pc = pc->GetNextType(CT_BRACE_OPEN, pc->GetLevel());
       return(  pc->IsNotNullChunk()
-            && pc->flags.test(PCF_ONE_LINER));
+            && pc->TestFlags(PCF_ONE_LINER));
    }
    return(false);
 } // is_class_one_liner
 
 
-void newlines_insert_blank_lines(void)
+void newlines_insert_blank_lines()
 {
    LOG_FUNC_ENTRY();
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      //LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-      //        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
-      if (chunk_is_token(pc, CT_IF))
+      //LOG_FMT(LNEWLINE, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+      //        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
+      if (pc->Is(CT_IF))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_if());
          log_rule_B("nl_before_if");
          newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_if());
          log_rule_B("nl_after_if");
       }
-      else if (chunk_is_token(pc, CT_FOR))
+      else if (pc->Is(CT_FOR))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_for());
          log_rule_B("nl_before_for");
          newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_for());
          log_rule_B("nl_after_for");
       }
-      else if (chunk_is_token(pc, CT_WHILE))
+      else if (pc->Is(CT_WHILE))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_while());
          log_rule_B("nl_before_while");
          newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_while());
          log_rule_B("nl_after_while");
       }
-      else if (chunk_is_token(pc, CT_SWITCH))
+      else if (pc->Is(CT_SWITCH))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_switch());
          log_rule_B("nl_before_switch");
          newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_switch());
          log_rule_B("nl_after_switch");
       }
-      else if (chunk_is_token(pc, CT_SYNCHRONIZED))
+      else if (pc->Is(CT_SYNCHRONIZED))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_synchronized());
          log_rule_B("nl_before_synchronized");
          newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_synchronized());
          log_rule_B("nl_after_synchronized");
       }
-      else if (chunk_is_token(pc, CT_DO))
+      else if (pc->Is(CT_DO))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_do());
          log_rule_B("nl_before_do");
          newlines_if_for_while_switch_post_blank_lines(pc, options::nl_after_do());
          log_rule_B("nl_after_do");
       }
-      else if (chunk_is_token(pc, CT_OC_INTF))
+      else if (pc->Is(CT_OC_INTF))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_oc_before_interface());
          log_rule_B("nl_oc_before_interface");
       }
-      else if (chunk_is_token(pc, CT_OC_END))
+      else if (pc->Is(CT_OC_END))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_oc_before_end());
          log_rule_B("nl_oc_before_end");
       }
-      else if (chunk_is_token(pc, CT_OC_IMPL))
+      else if (pc->Is(CT_OC_IMPL))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_oc_before_implementation());
          log_rule_B("nl_oc_before_implementation");
       }
-      else if (  chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-              || chunk_is_token(pc, CT_FUNC_DEF)
-              || chunk_is_token(pc, CT_FUNC_CLASS_PROTO)
-              || chunk_is_token(pc, CT_FUNC_PROTO))
+      else if (  pc->Is(CT_FUNC_CLASS_DEF)
+              || pc->Is(CT_FUNC_DEF)
+              || pc->Is(CT_FUNC_CLASS_PROTO)
+              || pc->Is(CT_FUNC_PROTO))
       {
          if (  options::nl_class_leave_one_liner_groups()
             && is_class_one_liner(pc))
@@ -5155,7 +5284,7 @@ void newlines_insert_blank_lines(void)
          }
          else
          {
-            newlines_func_pre_blank_lines(pc, pc->type);
+            newlines_func_pre_blank_lines(pc, pc->GetType());
          }
       }
       else
@@ -5167,7 +5296,7 @@ void newlines_insert_blank_lines(void)
 } // newlines_insert_blank_lines
 
 
-void newlines_functions_remove_extra_blank_lines(void)
+void newlines_functions_remove_extra_blank_lines()
 {
    LOG_FUNC_ENTRY();
 
@@ -5183,32 +5312,32 @@ void newlines_functions_remove_extra_blank_lines(void)
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      LOG_FMT(LNEWLINE, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
 
-      if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
-         || (  get_chunk_parent_type(pc) != CT_FUNC_DEF
-            && get_chunk_parent_type(pc) != CT_CPP_LAMBDA))
+      if (  pc->IsNot(CT_BRACE_OPEN)
+         || (  pc->GetParentType() != CT_FUNC_DEF
+            && pc->GetParentType() != CT_CPP_LAMBDA))
       {
          continue;
       }
-      const size_t startMoveLevel = pc->level;
+      const size_t startMoveLevel = pc->GetLevel();
 
       while (pc->IsNotNullChunk())
       {
-         if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            && pc->level == startMoveLevel)
+         if (  pc->Is(CT_BRACE_CLOSE)
+            && pc->GetLevel() == startMoveLevel)
          {
             break;
          }
 
          // delete newlines
-         if (  !chunk_is_token(pc, CT_COMMENT_MULTI)   // Issue #2195
-            && pc->nl_count > nl_max_blank_in_func)
+         if (  !pc->Is(CT_COMMENT_MULTI)   // Issue #2195
+            && pc->GetNlCount() > nl_max_blank_in_func)
          {
-            LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
-            pc->nl_count = nl_max_blank_in_func;
+            LOG_FMT(LNEWLINE, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
+            pc->SetNlCount(nl_max_blank_in_func);
             MARK_CHANGE();
             remove_next_newlines(pc);
          }
@@ -5221,7 +5350,7 @@ void newlines_functions_remove_extra_blank_lines(void)
 } // newlines_functions_remove_extra_blank_lines
 
 
-void newlines_squeeze_ifdef(void)
+void newlines_squeeze_ifdef()
 {
    LOG_FUNC_ENTRY();
 
@@ -5229,22 +5358,22 @@ void newlines_squeeze_ifdef(void)
 
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (  chunk_is_token(pc, CT_PREPROC)
-         && (  pc->level > 0
+      if (  pc->Is(CT_PREPROC)
+         && (  pc->GetLevel() > 0
             || options::nl_squeeze_ifdef_top_level()))
       {
          log_rule_B("nl_squeeze_ifdef_top_level");
          Chunk *ppr = pc->GetNext();
 
-         if (  chunk_is_token(ppr, CT_PP_IF)
-            || chunk_is_token(ppr, CT_PP_ELSE)
-            || chunk_is_token(ppr, CT_PP_ENDIF))
+         if (  ppr->Is(CT_PP_IF)
+            || ppr->Is(CT_PP_ELSE)
+            || ppr->Is(CT_PP_ENDIF))
          {
             Chunk *pnl = Chunk::NullChunkPtr;
             Chunk *nnl = ppr->GetNextNl();
 
-            if (  chunk_is_token(ppr, CT_PP_ELSE)
-               || chunk_is_token(ppr, CT_PP_ENDIF))
+            if (  ppr->Is(CT_PP_ELSE)
+               || ppr->Is(CT_PP_ENDIF))
             {
                pnl = pc->GetPrevNl();
             }
@@ -5255,28 +5384,28 @@ void newlines_squeeze_ifdef(void)
             {
                if (pnl->IsNotNullChunk())
                {
-                  if (pnl->nl_count > 1)
+                  if (pnl->GetNlCount() > 1)
                   {
-                     pnl->nl_count = 1;
+                     pnl->SetNlCount(1);
                      MARK_CHANGE();
 
                      tmp1 = pnl->GetPrevNnl();
                      tmp2 = nnl->GetPrevNnl();
 
                      LOG_FMT(LNEWLINE, "%s(%d): moved from after line %zu to after %zu\n",
-                             __func__, __LINE__, tmp1->orig_line, tmp2->orig_line);
+                             __func__, __LINE__, tmp1->GetOrigLine(), tmp2->GetOrigLine());
                   }
                }
 
-               if (  chunk_is_token(ppr, CT_PP_IF)
-                  || chunk_is_token(ppr, CT_PP_ELSE))
+               if (  ppr->Is(CT_PP_IF)
+                  || ppr->Is(CT_PP_ELSE))
                {
-                  if (nnl->nl_count > 1)
+                  if (nnl->GetNlCount() > 1)
                   {
                      tmp1 = nnl->GetPrevNnl();
                      LOG_FMT(LNEWLINE, "%s(%d): trimmed newlines after line %zu from %zu\n",
-                             __func__, __LINE__, tmp1->orig_line, nnl->nl_count);
-                     nnl->nl_count = 1;
+                             __func__, __LINE__, tmp1->GetOrigLine(), nnl->GetNlCount());
+                     nnl->SetNlCount(1);
                      MARK_CHANGE();
                   }
                }
@@ -5287,7 +5416,7 @@ void newlines_squeeze_ifdef(void)
 } // newlines_squeeze_ifdef
 
 
-void newlines_squeeze_paren_close(void)
+void newlines_squeeze_paren_close()
 {
    LOG_FUNC_ENTRY();
 
@@ -5298,7 +5427,7 @@ void newlines_squeeze_paren_close(void)
       Chunk *next;
       Chunk *prev;
 
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
          prev = pc->GetPrev();
       }
@@ -5310,33 +5439,30 @@ void newlines_squeeze_paren_close(void)
 
       if (  next->IsNotNullChunk()
          && prev->IsNotNullChunk()
-         && chunk_is_paren_close(next)
-         && chunk_is_paren_close(prev))
+         && next->IsParenClose()
+         && prev->IsParenClose())
       {
-         Chunk *prev_op = chunk_skip_to_match_rev(prev);
-         Chunk *next_op = chunk_skip_to_match_rev(next);
+         Chunk *prev_op = prev->GetOpeningParen();
+         Chunk *next_op = next->GetOpeningParen();
          bool  flag     = true;
 
-         if (true)
-         {
-            Chunk *tmp = prev;
+         Chunk *tmp = prev;
 
-            while (chunk_is_paren_close(tmp))
-            {
-               tmp = tmp->GetPrev();
-            }
+         while (tmp->IsParenClose())
+         {
+            tmp = tmp->GetPrev();
+         }
 
-            if (chunk_is_not_token(tmp, CT_NEWLINE))
-            {
-               flag = false;
-            }
+         if (tmp->IsNot(CT_NEWLINE))
+         {
+            flag = false;
          }
 
          if (flag)
          {
-            if (are_chunks_in_same_line(next_op, prev_op))
+            if (next_op->IsOnSameLine(prev_op))
             {
-               if (chunk_is_token(pc, CT_NEWLINE))
+               if (pc->Is(CT_NEWLINE))
                {
                   pc = next;
                }
@@ -5352,7 +5478,7 @@ void newlines_squeeze_paren_close(void)
 } // newlines_squeeze_paren_close
 
 
-void newlines_eat_start_end(void)
+void newlines_eat_start_end()
 {
    LOG_FUNC_ENTRY();
 
@@ -5370,23 +5496,23 @@ void newlines_eat_start_end(void)
 
       if (pc->IsNotNullChunk())
       {
-         if (chunk_is_token(pc, CT_NEWLINE))
+         if (pc->Is(CT_NEWLINE))
          {
             if (options::nl_start_of_file() == IARF_REMOVE)
             {
                log_rule_B("nl_start_of_file");
                LOG_FMT(LBLANKD, "%s(%d): eat_blanks_start_of_file %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               chunk_del(pc);
+                       __func__, __LINE__, pc->GetOrigLine());
+               Chunk::Delete(pc);
                MARK_CHANGE();
             }
             else if (  options::nl_start_of_file() == IARF_FORCE
-                    || (pc->nl_count < options::nl_start_of_file_min()))
+                    || (pc->GetNlCount() < options::nl_start_of_file_min()))
             {
                log_rule_B("nl_start_of_file");
                LOG_FMT(LBLANKD, "%s(%d): set_blanks_start_of_file %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               pc->nl_count = options::nl_start_of_file_min();
+                       __func__, __LINE__, pc->GetOrigLine());
+               pc->SetNlCount(options::nl_start_of_file_min());
                log_rule_B("nl_start_of_file_min");
                MARK_CHANGE();
             }
@@ -5397,15 +5523,15 @@ void newlines_eat_start_end(void)
             log_rule_B("nl_start_of_file");
             log_rule_B("nl_start_of_file_min");
             Chunk chunk;
-            set_chunk_type(&chunk, CT_NEWLINE);
-            chunk.orig_line = pc->orig_line;
-            chunk.orig_col  = pc->orig_col;
-            chunk.pp_level  = pc->pp_level;
-            chunk.nl_count  = options::nl_start_of_file_min();
+            chunk.SetType(CT_NEWLINE);
+            chunk.SetOrigLine(pc->GetOrigLine());
+            chunk.SetOrigCol(pc->GetOrigCol());
+            chunk.SetPpLevel(pc->GetPpLevel());
+            chunk.SetNlCount(options::nl_start_of_file_min());
             log_rule_B("nl_start_of_file_min");
-            chunk_add_before(&chunk, pc);
+            chunk.CopyAndAddBefore(pc);
             LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline before '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
             MARK_CHANGE();
          }
       }
@@ -5423,28 +5549,28 @@ void newlines_eat_start_end(void)
 
       if (pc->IsNotNullChunk())
       {
-         if (chunk_is_token(pc, CT_NEWLINE))
+         if (pc->Is(CT_NEWLINE))
          {
             if (options::nl_end_of_file() == IARF_REMOVE)
             {
                log_rule_B("nl_end_of_file");
                LOG_FMT(LBLANKD, "%s(%d): eat_blanks_end_of_file %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               chunk_del(pc);
+                       __func__, __LINE__, pc->GetOrigLine());
+               Chunk::Delete(pc);
                MARK_CHANGE();
             }
             else if (  options::nl_end_of_file() == IARF_FORCE
-                    || (pc->nl_count < options::nl_end_of_file_min()))
+                    || (pc->GetNlCount() < options::nl_end_of_file_min()))
             {
                log_rule_B("nl_end_of_file");
                log_rule_B("nl_end_of_file_min");
 
-               if (pc->nl_count != options::nl_end_of_file_min())
+               if (pc->GetNlCount() != options::nl_end_of_file_min())
                {
                   log_rule_B("nl_end_of_file_min");
                   LOG_FMT(LBLANKD, "%s(%d): set_blanks_end_of_file %zu\n",
-                          __func__, __LINE__, pc->orig_line);
-                  pc->nl_count = options::nl_end_of_file_min();
+                          __func__, __LINE__, pc->GetOrigLine());
+                  pc->SetNlCount(options::nl_end_of_file_min());
                   log_rule_B("nl_end_of_file_min");
                   MARK_CHANGE();
                }
@@ -5456,15 +5582,15 @@ void newlines_eat_start_end(void)
             log_rule_B("nl_end_of_file");
             log_rule_B("nl_end_of_file_min");
             Chunk chunk;
-            set_chunk_type(&chunk, CT_NEWLINE);
-            chunk.orig_line = pc->orig_line;
-            chunk.orig_col  = pc->orig_col;
-            chunk.pp_level  = pc->pp_level;
-            chunk.nl_count  = options::nl_end_of_file_min();
+            chunk.SetType(CT_NEWLINE);
+            chunk.SetOrigLine(pc->GetOrigLine());
+            chunk.SetOrigCol(pc->GetOrigCol());
+            chunk.SetPpLevel(pc->GetPpLevel());
+            chunk.SetNlCount(options::nl_end_of_file_min());
             log_rule_B("nl_end_of_file_min");
-            chunk_add_before(&chunk, nullptr);
+            chunk.CopyAndAddBefore(Chunk::NullChunkPtr);
             LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline after '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
             MARK_CHANGE();
          }
       }
@@ -5488,23 +5614,23 @@ void newlines_chunk_pos(E_Token chunk_type, token_pos_e mode)
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       char copy[1000];
-      LOG_FMT(LNEWLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy));
+      LOG_FMT(LNEWLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy));
       // produces much more log output. Use it only debugging purpose
-      //log_pcf_flags(LNEWLINE, pc->flags);
+      //log_pcf_flags(LNEWLINE, pc->GetFlags());
 
-      if (chunk_is_token(pc, chunk_type))
+      if (pc->Is(chunk_type))
       {
          token_pos_e mode_local;
 
          if (chunk_type == CT_COMMA)
          {
-            LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            LOG_FMT(LNEWLINE, "%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()));
             // produces much more log output. Use it only debugging purpose
-            //log_pcf_flags(LNEWLINE, pc->flags);
+            //log_pcf_flags(LNEWLINE, pc->GetFlags());
 
-            if (pc->flags.test(PCF_IN_CONST_ARGS)) // Issue #2250
+            if (pc->TestFlags(PCF_IN_CONST_ARGS)) // Issue #2250
             {
                continue;
             }
@@ -5515,13 +5641,13 @@ void newlines_chunk_pos(E_Token chunk_type, token_pos_e mode)
              * BUT we must take care of options::pos_class_comma()
              * TODO and options::pos_constr_comma()
              */
-            if (pc->flags.test(PCF_IN_CLASS_BASE))
+            if (pc->TestFlags(PCF_IN_CLASS_BASE))
             {
                // change mode
                log_rule_B("pos_class_comma");
                mode_local = options::pos_class_comma();
             }
-            else if (pc->flags.test(PCF_IN_ENUM))
+            else if (pc->TestFlags(PCF_IN_ENUM))
             {
                log_rule_B("pos_enum_comma");
                mode_local = options::pos_enum_comma();
@@ -5543,12 +5669,12 @@ void newlines_chunk_pos(E_Token chunk_type, token_pos_e mode)
          LOG_FMT(LNEWLINE, "%s(%d): mode_local is %s\n",
                  __func__, __LINE__, to_string(mode_local));
 
-         LOG_FMT(LNEWLINE, "%s(%d): prev->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                 __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text());
-         LOG_FMT(LNEWLINE, "%s(%d): next->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                 __func__, __LINE__, next->orig_line, next->orig_col, next->Text());
-         size_t nl_flag = ((chunk_is_newline(prev) ? 1 : 0) |
-                           (chunk_is_newline(next) ? 2 : 0));
+         LOG_FMT(LNEWLINE, "%s(%d): prev orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text());
+         LOG_FMT(LNEWLINE, "%s(%d): next orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text());
+         size_t nl_flag = ((prev->IsNewline() ? 1 : 0) |
+                           (next->IsNewline() ? 2 : 0));
          LOG_FMT(LNEWLINE, "%s(%d): nl_flag is %zu\n",
                  __func__, __LINE__, nl_flag);
 
@@ -5573,7 +5699,7 @@ void newlines_chunk_pos(E_Token chunk_type, token_pos_e mode)
 
                if (  next2->IsNotNullChunk()
                   && !next2->IsComment()
-                  && !(chunk_is_token(next2, CT_BRACE_OPEN)))
+                  && !next2->Is(CT_BRACE_OPEN))
                {
                   remove_next_newlines(pc);
                }
@@ -5632,41 +5758,41 @@ void newlines_chunk_pos(E_Token chunk_type, token_pos_e mode)
          {
             Chunk *next2 = next->GetNext();
 
-            if (  chunk_is_token(next2, CT_PREPROC)
+            if (  next2->Is(CT_PREPROC)
                || (  chunk_type == CT_ASSIGN
-                  && chunk_is_token(next2, CT_BRACE_OPEN)))
+                  && next2->Is(CT_BRACE_OPEN)))
             {
                continue;
             }
 
-            if (next->nl_count == 1)
+            if (next->GetNlCount() == 1)
             {
                if (  prev != nullptr
-                  && !prev->flags.test(PCF_IN_PREPROC))
+                  && !prev->TestFlags(PCF_IN_PREPROC))
                {
                   // move the CT_BOOL to after the newline
-                  chunk_move_after(pc, next);
+                  pc->MoveAfter(next);
                }
             }
          }
          else
          {
-            LOG_FMT(LNEWLINE, "%s(%d): prev->orig_line is %zu, orig_col is %zu, Text() is '%s', nl_count is %zu\n",
-                    __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text(), prev->nl_count);
+            LOG_FMT(LNEWLINE, "%s(%d): prev orig line is %zu, orig col is %zu, Text() is '%s', new line count is %zu\n",
+                    __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text(), prev->GetNlCount());
 
-            if (prev->nl_count == 1)
+            if (prev->GetNlCount() == 1)
             {
                // Back up to the next non-comment item
                prev = prev->GetPrevNc();
-               LOG_FMT(LNEWLINE, "%s(%d): prev->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                       __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text());
+               LOG_FMT(LNEWLINE, "%s(%d): prev orig line is %zu, orig col is %zu, Text() is '%s'\n",
+                       __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text());
 
                if (  prev->IsNotNullChunk()
-                  && !chunk_is_newline(prev)
-                  && !prev->flags.test(PCF_IN_PREPROC)
-                  && !prev->flags.test(PCF_IN_OC_MSG))
+                  && !prev->IsNewline()
+                  && !prev->TestFlags(PCF_IN_PREPROC)
+                  && !prev->TestFlags(PCF_IN_OC_MSG))
                {
-                  chunk_move_after(pc, prev);
+                  pc->MoveAfter(prev);
                }
             }
          }
@@ -5728,40 +5854,40 @@ void newlines_class_colon_pos(E_Token tok)
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (  ccolon == nullptr
-         && chunk_is_not_token(pc, tok))
+         && pc->IsNot(tok))
       {
          continue;
       }
       Chunk *prev;
       Chunk *next;
 
-      if (chunk_is_token(pc, tok))
+      if (pc->Is(tok))
       {
-         LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         LOG_FMT(LBLANKD, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
          ccolon = pc;
          prev   = pc->GetPrevNc();
          next   = pc->GetNextNc();
 
-         if (chunk_is_token(pc, CT_CONSTR_COLON))
+         if (pc->Is(CT_CONSTR_COLON))
          {
-            LOG_FMT(LBLANKD, "%s(%d): pc->orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
-            Chunk *paren_vor_value = pc->GetNextType(CT_FPAREN_OPEN, pc->level);
+            LOG_FMT(LBLANKD, "%s(%d): pc orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
+            Chunk *paren_vor_value = pc->GetNextType(CT_FPAREN_OPEN, pc->GetLevel());
 
             if (  with_acv
                && paren_vor_value->IsNotNullChunk())
             {
-               LOG_FMT(LBLANKD, "%s(%d): paren_vor_value->orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                       __func__, __LINE__, paren_vor_value->orig_line, paren_vor_value->orig_col,
-                       paren_vor_value->Text(), get_token_name(paren_vor_value->type));
-               constructorValue.NewLines(paren_vor_value->nl_count);
+               LOG_FMT(LBLANKD, "%s(%d): paren_vor_value orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                       __func__, __LINE__, paren_vor_value->GetOrigLine(), paren_vor_value->GetOrigCol(),
+                       paren_vor_value->Text(), get_token_name(paren_vor_value->GetType()));
+               constructorValue.NewLines(paren_vor_value->GetNlCount());
                constructorValue.Add(paren_vor_value);
             }
          }
 
-         if (  !chunk_is_newline(prev)
-            && !chunk_is_newline(next)
+         if (  !prev->IsNewline()
+            && !next->IsNewline()
             && (anc & IARF_ADD))                   // nl_class_colon, nl_constr_colon: 1
 
          {
@@ -5772,18 +5898,18 @@ void newlines_class_colon_pos(E_Token tok)
 
          if (anc == IARF_REMOVE)                   // nl_class_colon, nl_constr_colon: 2
          {
-            if (  chunk_is_newline(prev)
-               && chunk_safe_to_del_nl(prev))
+            if (  prev->IsNewline()
+               && prev->SafeToDeleteNl())
             {
-               chunk_del(prev);
+               Chunk::Delete(prev);
                MARK_CHANGE();
                prev = pc->GetPrevNc();
             }
 
-            if (  chunk_is_newline(next)
-               && chunk_safe_to_del_nl(next))
+            if (  next->IsNewline()
+               && next->SafeToDeleteNl())
             {
-               chunk_del(next);
+               Chunk::Delete(next);
                MARK_CHANGE();
                next = pc->GetNextNc();
             }
@@ -5791,28 +5917,28 @@ void newlines_class_colon_pos(E_Token tok)
 
          if (tpc & TP_TRAIL)                       // pos_class_colon, pos_constr_colon: 4
          {
-            if (  chunk_is_newline(prev)
-               && prev->nl_count == 1
-               && chunk_safe_to_del_nl(prev))
+            if (  prev->IsNewline()
+               && prev->GetNlCount() == 1
+               && prev->SafeToDeleteNl())
             {
-               chunk_swap(pc, prev);
+               pc->Swap(prev);
             }
          }
          else if (tpc & TP_LEAD)                   // pos_class_colon, pos_constr_colon: 3
          {
-            if (  chunk_is_newline(next)
-               && next->nl_count == 1
-               && chunk_safe_to_del_nl(next))
+            if (  next->IsNewline()
+               && next->GetNlCount() == 1
+               && next->SafeToDeleteNl())
             {
-               chunk_swap(pc, next);
+               pc->Swap(next);
             }
          }
       }
       else
       {
-         // (pc->type != tok)
-         if (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || chunk_is_token(pc, CT_SEMICOLON))
+         // (pc->GetType() != tok)
+         if (  pc->Is(CT_BRACE_OPEN)
+            || pc->Is(CT_SEMICOLON))
          {
             ccolon = nullptr;
 
@@ -5823,20 +5949,20 @@ void newlines_class_colon_pos(E_Token tok)
             continue;
          }
 
-         if (  chunk_is_token(pc, CT_COMMA)
-            && pc->level == ccolon->level)
+         if (  pc->Is(CT_COMMA)
+            && pc->GetLevel() == ccolon->GetLevel())
          {
-            LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
-            Chunk *paren_vor_value = pc->GetNextType(CT_FPAREN_OPEN, pc->level);
+            LOG_FMT(LBLANKD, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
+            Chunk *paren_vor_value = pc->GetNextType(CT_FPAREN_OPEN, pc->GetLevel());
 
             if (  with_acv
                && paren_vor_value->IsNotNullChunk())
             {
-               LOG_FMT(LBLANKD, "%s(%d): paren_vor_value->orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                       __func__, __LINE__, paren_vor_value->orig_line, paren_vor_value->orig_col,
-                       paren_vor_value->Text(), get_token_name(paren_vor_value->type));
-               constructorValue.NewLines(paren_vor_value->nl_count);
+               LOG_FMT(LBLANKD, "%s(%d): paren_vor_value orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                       __func__, __LINE__, paren_vor_value->GetOrigLine(), paren_vor_value->GetOrigCol(),
+                       paren_vor_value->Text(), get_token_name(paren_vor_value->GetType()));
+               constructorValue.NewLines(paren_vor_value->GetNlCount());
                constructorValue.Add(paren_vor_value);
             }
 
@@ -5848,7 +5974,7 @@ void newlines_class_colon_pos(E_Token tok)
                   {
                      Chunk *after = pc->GetNext();   // Issue #2759
 
-                     if (chunk_is_not_token(after, CT_COMMENT_CPP))
+                     if (after->IsNot(CT_COMMENT_CPP))
                      {
                         newline_force_after(pc);
                      }
@@ -5860,10 +5986,10 @@ void newlines_class_colon_pos(E_Token tok)
                   }
                   prev = pc->GetPrevNc();
 
-                  if (  chunk_is_newline(prev)
-                     && chunk_safe_to_del_nl(prev))
+                  if (  prev->IsNewline()
+                     && prev->SafeToDeleteNl())
                   {
-                     chunk_del(prev);
+                     Chunk::Delete(prev);
                      MARK_CHANGE();
                   }
                }
@@ -5880,10 +6006,10 @@ void newlines_class_colon_pos(E_Token tok)
                   }
                   next = pc->GetNextNc();
 
-                  if (  chunk_is_newline(next)
-                     && chunk_safe_to_del_nl(next))
+                  if (  next->IsNewline()
+                     && next->SafeToDeleteNl())
                   {
-                     chunk_del(next);
+                     Chunk::Delete(next);
                      MARK_CHANGE();
                   }
                }
@@ -5892,22 +6018,22 @@ void newlines_class_colon_pos(E_Token tok)
             {
                next = pc->GetNext();
 
-               if (  chunk_is_newline(next)
-                  && chunk_safe_to_del_nl(next))
+               if (  next->IsNewline()
+                  && next->SafeToDeleteNl())
                {
                   // comma is after
-                  chunk_del(next);
+                  Chunk::Delete(next);
                   MARK_CHANGE();
                }
                else
                {
                   prev = pc->GetPrev();
 
-                  if (  chunk_is_newline(prev)
-                     && chunk_safe_to_del_nl(prev))
+                  if (  prev->IsNewline()
+                     && prev->SafeToDeleteNl())
                   {
                      // comma is before
-                     chunk_del(prev);
+                     Chunk::Delete(prev);
                      MARK_CHANGE();
                   }
                }
@@ -5929,11 +6055,11 @@ static void blank_line_max(Chunk *pc, Option<unsigned> &opt)
    const auto optval = opt();
 
    if (  (optval > 0)
-      && (pc->nl_count > optval))
+      && (pc->GetNlCount() > optval))
    {
       LOG_FMT(LBLANKD, "%s(%d): do_blank_lines: %s max line %zu\n",
-              __func__, __LINE__, opt.name(), pc->orig_line);
-      pc->nl_count = optval;
+              __func__, __LINE__, opt.name(), pc->GetOrigLine());
+      pc->SetNlCount(optval);
       MARK_CHANGE();
    }
 } // blank_line_max
@@ -5943,7 +6069,7 @@ iarf_e newline_template_option(Chunk *pc, iarf_e special, iarf_e base, iarf_e fa
 {
    Chunk *const prev = pc->GetPrevNcNnl();
 
-   if (  chunk_is_token(prev, CT_ANGLE_OPEN)
+   if (  prev->Is(CT_ANGLE_OPEN)
       && special != IARF_IGNORE)
    {
       return(special);
@@ -5963,50 +6089,49 @@ bool is_func_proto_group(Chunk *pc, E_Token one_liner_type)
 {
    if (  pc != nullptr
       && options::nl_class_leave_one_liner_groups()
-      && (  chunk_is_token(pc, one_liner_type)
-         || get_chunk_parent_type(pc) == one_liner_type)
-      && pc->flags.test(PCF_IN_CLASS))
+      && (  pc->Is(one_liner_type)
+         || pc->GetParentType() == one_liner_type)
+      && pc->TestFlags(PCF_IN_CLASS))
    {
       log_rule_B("nl_class_leave_one_liner_groups");
 
-      if (chunk_is_token(pc, CT_BRACE_CLOSE))
+      if (pc->Is(CT_BRACE_CLOSE))
       {
-         return(pc->flags.test(PCF_ONE_LINER));
+         return(pc->TestFlags(PCF_ONE_LINER));
       }
       else
       {
          // Find opening brace
-         pc = pc->GetNextType(CT_BRACE_OPEN, pc->level);
+         pc = pc->GetNextType(CT_BRACE_OPEN, pc->GetLevel());
          return(  pc->IsNotNullChunk()
-               && pc->flags.test(PCF_ONE_LINER));
+               && pc->TestFlags(PCF_ONE_LINER));
       }
    }
    return(false);
 } // is_func_proto_group
 
 
-void do_blank_lines(void)
+void do_blank_lines()
 {
    LOG_FUNC_ENTRY();
 
-   for (Chunk *pc = Chunk::GetHead(); pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetNext())
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
-         LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
+         LOG_FMT(LBLANKD, "%s(%d): orig line is %zu, orig col is %zu, <Newline>, nl is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetNlCount());
       }
       else
       {
          char copy[1000];
-         LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type));
+         LOG_FMT(LBLANKD, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy), get_token_name(pc->GetType()));
       }
-      LOG_FMT(LBLANK, "%s(%d): nl_count is %zu\n",
-              __func__, __LINE__, pc->nl_count);
+      LOG_FMT(LBLANK, "%s(%d): new line count is %zu\n",
+              __func__, __LINE__, pc->GetNlCount());
 
-      //if (pc->type != CT_NEWLINE)
-      if (chunk_is_not_token(pc, CT_NEWLINE))
+      if (pc->IsNot(CT_NEWLINE))
       {
          continue;
       }
@@ -6014,11 +6139,11 @@ void do_blank_lines(void)
 
       if (prev->IsNotNullChunk())
       {
-         LOG_FMT(LBLANK, "%s(%d): prev->orig_line is %zu, prev->Text() '%s', prev->type is %s\n",
-                 __func__, __LINE__, pc->orig_line,
-                 prev->Text(), get_token_name(prev->type));
+         LOG_FMT(LBLANK, "%s(%d): prev orig line is %zu, prev->Text() '%s', prev->GetType() is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(),
+                 prev->Text(), get_token_name(prev->GetType()));
 
-         if (chunk_is_token(prev, CT_IGNORED))
+         if (prev->Is(CT_IGNORED))
          {
             continue;
          }
@@ -6036,14 +6161,14 @@ void do_blank_lines(void)
          || next->IsNullChunk())
       {
          line_added = true;
-         ++pc->nl_count;
-         LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text is '%s', ++ nl_count is now %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), pc->nl_count);
+         pc->SetNlCount(pc->GetNlCount() + 1);
+         LOG_FMT(LBLANK, "%s(%d): orig line is %zu, orig col is %zu, text is '%s', new line count is now %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), pc->GetNlCount());
       }
 
       // Limit consecutive newlines
       if (  (options::nl_max() > 0)
-         && (pc->nl_count > options::nl_max()))
+         && (pc->GetNlCount() > options::nl_max()))
       {
          log_rule_B("nl_max");
          blank_line_max(pc, options::nl_max);
@@ -6051,29 +6176,29 @@ void do_blank_lines(void)
 
       if (!can_increase_nl(pc))
       {
-         LOG_FMT(LBLANKD, "%s(%d): force to 1 orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+         LOG_FMT(LBLANKD, "%s(%d): force to 1 orig line is %zu, orig col is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
 
-         if (pc->nl_count != 1)
+         if (pc->GetNlCount() != 1)
          {
-            pc->nl_count = 1;
+            pc->SetNlCount(1);
             MARK_CHANGE();
          }
          continue;
       }
 
       // Control blanks before multi-line comments
-      if (  (options::nl_before_block_comment() > pc->nl_count)
-         && chunk_is_token(next, CT_COMMENT_MULTI))
+      if (  (options::nl_before_block_comment() > pc->GetNlCount())
+         && next->Is(CT_COMMENT_MULTI))
       {
          log_rule_B("nl_before_block_comment");
 
          // Don't add blanks after an open brace or a case statement
-         if (  (  prev == nullptr
-               || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_VBRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_CASE_COLON)))
-            && chunk_is_not_token(pcmt, CT_COMMENT_MULTI))    // Issue #2383
+         if (  (  prev->IsNullChunk()
+               || (  prev->IsNot(CT_BRACE_OPEN)
+                  && prev->IsNot(CT_VBRACE_OPEN)
+                  && prev->IsNot(CT_CASE_COLON)))
+            && pcmt->IsNot(CT_COMMENT_MULTI))    // Issue #2383
          {
             blank_line_set(pc, options::nl_before_block_comment);
             log_rule_B("nl_before_block_comment");
@@ -6081,17 +6206,17 @@ void do_blank_lines(void)
       }
 
       // Control blanks before single line C comments
-      if (  (options::nl_before_c_comment() > pc->nl_count)
-         && chunk_is_token(next, CT_COMMENT))
+      if (  (options::nl_before_c_comment() > pc->GetNlCount())
+         && next->Is(CT_COMMENT))
       {
          log_rule_B("nl_before_c_comment");
 
          // Don't add blanks after an open brace, a case stamement, or a comment
-         if (  (  prev == nullptr
-               || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_VBRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_CASE_COLON)))
-            && chunk_is_not_token(pcmt, CT_COMMENT))    // Issue #2383
+         if (  (  prev->IsNullChunk()
+               || (  prev->IsNot(CT_BRACE_OPEN)
+                  && prev->IsNot(CT_VBRACE_OPEN)
+                  && prev->IsNot(CT_CASE_COLON)))
+            && pcmt->IsNot(CT_COMMENT))    // Issue #2383
          {
             blank_line_set(pc, options::nl_before_c_comment);
             log_rule_B("nl_before_c_comment");
@@ -6099,17 +6224,17 @@ void do_blank_lines(void)
       }
 
       // Control blanks before CPP comments
-      if (  (options::nl_before_cpp_comment() > pc->nl_count)
-         && chunk_is_token(next, CT_COMMENT_CPP))
+      if (  (options::nl_before_cpp_comment() > pc->GetNlCount())
+         && next->Is(CT_COMMENT_CPP))
       {
          log_rule_B("nl_before_cpp_comment");
 
          // Don't add blanks after an open brace or a case statement
-         if (  (  prev == nullptr
-               || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_VBRACE_OPEN)
-                  && chunk_is_not_token(prev, CT_CASE_COLON)))
-            && chunk_is_not_token(pcmt, CT_COMMENT_CPP))    // Issue #2383
+         if (  (  prev->IsNullChunk()
+               || (  prev->IsNot(CT_BRACE_OPEN)
+                  && prev->IsNot(CT_VBRACE_OPEN)
+                  && prev->IsNot(CT_CASE_COLON)))
+            && pcmt->IsNot(CT_COMMENT_CPP))    // Issue #2383
          {
             blank_line_set(pc, options::nl_before_cpp_comment);
             log_rule_B("nl_before_cpp_comment");
@@ -6117,53 +6242,53 @@ void do_blank_lines(void)
       }
 
       // Control blanks before a class/struct
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            || chunk_is_token(prev, CT_BRACE_CLOSE))
-         && (  get_chunk_parent_type(prev) == CT_CLASS
-            || get_chunk_parent_type(prev) == CT_STRUCT))
+      if (  (  prev->Is(CT_SEMICOLON)
+            || prev->Is(CT_BRACE_CLOSE))
+         && (  prev->GetParentType() == CT_CLASS
+            || prev->GetParentType() == CT_STRUCT))
       {
-         E_Token parent_type = get_chunk_parent_type(prev);
-         Chunk   *start      = prev->GetPrevType(parent_type, prev->level);
+         E_Token parent_type = prev->GetParentType();
+         Chunk   *start      = prev->GetPrevType(parent_type, prev->GetLevel());
          Chunk   *tmp        = start;
 
          // Is this a class/struct template?
-         if (get_chunk_parent_type(tmp) == CT_TEMPLATE)
+         if (tmp->GetParentType() == CT_TEMPLATE)
          {
-            tmp = tmp->GetPrevType(CT_TEMPLATE, prev->level);
+            tmp = tmp->GetPrevType(CT_TEMPLATE, prev->GetLevel());
             tmp = tmp->GetPrevNc();
          }
          else
          {
             tmp = tmp->GetPrevNc();
 
-            while (  chunk_is_token(tmp, CT_NEWLINE)
+            while (  tmp->Is(CT_NEWLINE)
                   && tmp->GetPrev()->IsComment())
             {
                tmp = tmp->GetPrev()->GetPrevNc();
             }
 
-            if (chunk_is_token(tmp, CT_FRIEND))
+            if (tmp->Is(CT_FRIEND))
             {
                // Account for a friend declaration
                tmp = tmp->GetPrevNc();
             }
          }
 
-         while (  chunk_is_token(tmp, CT_NEWLINE)
+         while (  tmp->Is(CT_NEWLINE)
                && tmp->GetPrev()->IsComment())
          {
             tmp = tmp->GetPrev()->GetPrevNc();
          }
 
          if (  tmp->IsNotNullChunk()
-            && !start->flags.test(PCF_INCOMPLETE))
+            && !start->TestFlags(PCF_INCOMPLETE))
          {
-            if (parent_type == CT_CLASS && options::nl_before_class() > tmp->nl_count)
+            if (parent_type == CT_CLASS && options::nl_before_class() > tmp->GetNlCount())
             {
                log_rule_B("nl_before_class");
                blank_line_set(tmp, options::nl_before_class);
             }
-            else if (parent_type == CT_STRUCT && options::nl_before_struct() > tmp->nl_count)
+            else if (parent_type == CT_STRUCT && options::nl_before_struct() > tmp->GetNlCount())
             {
                log_rule_B("nl_before_struct");
                blank_line_set(tmp, options::nl_before_struct);
@@ -6171,28 +6296,28 @@ void do_blank_lines(void)
          }
       }
 
-      if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-         && get_chunk_parent_type(prev) == CT_NAMESPACE)
+      if (  prev->Is(CT_BRACE_CLOSE)
+         && prev->GetParentType() == CT_NAMESPACE)
       {
          // Control blanks before a namespace
-         Chunk *tmp = prev->GetPrevType(CT_NAMESPACE, prev->level);
+         Chunk *tmp = prev->GetPrevType(CT_NAMESPACE, prev->GetLevel());
          tmp = tmp->GetPrevNc();
 
-         while (  chunk_is_token(tmp, CT_NEWLINE)
+         while (  tmp->Is(CT_NEWLINE)
                && tmp->GetPrev()->IsComment())
          {
             tmp = tmp->GetPrev()->GetPrevNc();
          }
 
          if (  tmp->IsNotNullChunk()
-            && options::nl_before_namespace() > tmp->nl_count)
+            && options::nl_before_namespace() > tmp->GetNlCount())
          {
             log_rule_B("nl_before_namespace");
             blank_line_set(tmp, options::nl_before_namespace);
          }
 
          // Add blanks after namespace
-         if (options::nl_after_namespace() > pc->nl_count)
+         if (options::nl_after_namespace() > pc->GetNlCount())
          {
             log_rule_B("nl_after_namespace");
             blank_line_set(pc, options::nl_after_namespace);
@@ -6200,12 +6325,12 @@ void do_blank_lines(void)
       }
 
       // Control blanks inside empty function body
-      if (  chunk_is_token(prev, CT_BRACE_OPEN)
-         && chunk_is_token(next, CT_BRACE_CLOSE)
-         && (  get_chunk_parent_type(prev) == CT_FUNC_DEF
-            || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF)
-         && options::nl_inside_empty_func() > pc->nl_count
-         && prev->flags.test(PCF_EMPTY_BODY))
+      if (  prev->Is(CT_BRACE_OPEN)
+         && next->Is(CT_BRACE_CLOSE)
+         && (  prev->GetParentType() == CT_FUNC_DEF
+            || prev->GetParentType() == CT_FUNC_CLASS_DEF)
+         && options::nl_inside_empty_func() > pc->GetNlCount()
+         && prev->TestFlags(PCF_EMPTY_BODY))
       {
          blank_line_set(pc, options::nl_inside_empty_func);
          log_rule_B("nl_inside_empty_func");
@@ -6213,15 +6338,14 @@ void do_blank_lines(void)
 
       // Control blanks after an access spec
       if (  (options::nl_after_access_spec() > 0)
-         && (options::nl_after_access_spec() != pc->nl_count)
-         && chunk_is_token(prev, CT_ACCESS_COLON))
+         && (options::nl_after_access_spec() != pc->GetNlCount())
+         && prev->Is(CT_ACCESS_COLON))
       {
          log_rule_B("nl_after_access_spec");
 
          // Don't add blanks before a closing brace
          if (  next->IsNullChunk()
-            || (  chunk_is_not_token(next, CT_BRACE_CLOSE)
-               && chunk_is_not_token(next, CT_VBRACE_CLOSE)))
+            || !next->IsBraceClose())
          {
             log_rule_B("nl_after_access_spec");
             blank_line_set(pc, options::nl_after_access_spec);
@@ -6229,15 +6353,15 @@ void do_blank_lines(void)
       }
 
       // Add blanks after function bodies
-      if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-         && (  get_chunk_parent_type(prev) == CT_FUNC_DEF
-            || get_chunk_parent_type(prev) == CT_FUNC_CLASS_DEF
-            || get_chunk_parent_type(prev) == CT_OC_MSG_DECL
-            || get_chunk_parent_type(prev) == CT_ASSIGN))
+      if (  prev->Is(CT_BRACE_CLOSE)
+         && (  prev->GetParentType() == CT_FUNC_DEF
+            || prev->GetParentType() == CT_FUNC_CLASS_DEF
+            || prev->GetParentType() == CT_OC_MSG_DECL
+            || prev->GetParentType() == CT_ASSIGN))
       {
-         if (prev->flags.test(PCF_ONE_LINER))
+         if (prev->TestFlags(PCF_ONE_LINER))
          {
-            if (options::nl_after_func_body_one_liner() > pc->nl_count)
+            if (options::nl_after_func_body_one_liner() > pc->GetNlCount())
             {
                log_rule_B("nl_after_func_body_one_liner");
                blank_line_set(pc, options::nl_after_func_body_one_liner);
@@ -6245,12 +6369,12 @@ void do_blank_lines(void)
          }
          else
          {
-            if (  prev->flags.test(PCF_IN_CLASS)
+            if (  prev->TestFlags(PCF_IN_CLASS)
                && (options::nl_after_func_body_class() > 0))
             {
                log_rule_B("nl_after_func_body_class");
 
-               if (options::nl_after_func_body_class() != pc->nl_count)
+               if (options::nl_after_func_body_class() != pc->GetNlCount())
                {
                   log_rule_B("nl_after_func_body_class");
                   blank_line_set(pc, options::nl_after_func_body_class);
@@ -6261,9 +6385,9 @@ void do_blank_lines(void)
                log_rule_B("nl_after_func_body");
 
                // Issue #1734
-               if (!(pc->prev->flags.test(PCF_IN_TRY_BLOCK)))
+               if (!(pc->GetPrev()->TestFlags(PCF_IN_TRY_BLOCK)))
                {
-                  if (options::nl_after_func_body() != pc->nl_count)
+                  if (options::nl_after_func_body() != pc->GetNlCount())
                   {
                      log_rule_B("nl_after_func_body");
                      blank_line_set(pc, options::nl_after_func_body);
@@ -6274,20 +6398,20 @@ void do_blank_lines(void)
       }
 
       // Add blanks after function prototypes
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            && get_chunk_parent_type(prev) == CT_FUNC_PROTO)
+      if (  (  prev->Is(CT_SEMICOLON)
+            && prev->GetParentType() == CT_FUNC_PROTO)
          || is_func_proto_group(prev, CT_FUNC_DEF))
       {
-         if (options::nl_after_func_proto() > pc->nl_count)
+         if (options::nl_after_func_proto() > pc->GetNlCount())
          {
             log_rule_B("nl_after_func_proto");
-            pc->nl_count = options::nl_after_func_proto();
+            pc->SetNlCount(options::nl_after_func_proto());
             MARK_CHANGE();
          }
 
-         if (  (options::nl_after_func_proto_group() > pc->nl_count)
+         if (  (options::nl_after_func_proto_group() > pc->GetNlCount())
             && next->IsNotNullChunk()
-            && get_chunk_parent_type(next) != CT_FUNC_PROTO
+            && next->GetParentType() != CT_FUNC_PROTO
             && !is_func_proto_group(next, CT_FUNC_DEF))
          {
             log_rule_B("nl_after_func_proto_group");
@@ -6296,20 +6420,20 @@ void do_blank_lines(void)
       }
 
       // Issue #411: Add blanks after function class prototypes
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            && get_chunk_parent_type(prev) == CT_FUNC_CLASS_PROTO)
+      if (  (  prev->Is(CT_SEMICOLON)
+            && prev->GetParentType() == CT_FUNC_CLASS_PROTO)
          || is_func_proto_group(prev, CT_FUNC_CLASS_DEF))
       {
-         if (options::nl_after_func_class_proto() > pc->nl_count)
+         if (options::nl_after_func_class_proto() > pc->GetNlCount())
          {
             log_rule_B("nl_after_func_class_proto");
-            pc->nl_count = options::nl_after_func_class_proto();
+            pc->SetNlCount(options::nl_after_func_class_proto());
             MARK_CHANGE();
          }
 
-         if (  (options::nl_after_func_class_proto_group() > pc->nl_count)
-            && chunk_is_not_token(next, CT_FUNC_CLASS_PROTO)
-            && get_chunk_parent_type(next) != CT_FUNC_CLASS_PROTO
+         if (  (options::nl_after_func_class_proto_group() > pc->GetNlCount())
+            && next->IsNot(CT_FUNC_CLASS_PROTO)
+            && next->GetParentType() != CT_FUNC_CLASS_PROTO
             && !is_func_proto_group(next, CT_FUNC_CLASS_DEF))
          {
             log_rule_B("nl_after_func_class_proto_group");
@@ -6318,20 +6442,20 @@ void do_blank_lines(void)
       }
 
       // Add blanks after struct/enum/union/class
-      if (  (  chunk_is_token(prev, CT_SEMICOLON)
-            || chunk_is_token(prev, CT_BRACE_CLOSE))
-         && (  get_chunk_parent_type(prev) == CT_STRUCT
-            || get_chunk_parent_type(prev) == CT_ENUM
-            || get_chunk_parent_type(prev) == CT_UNION
-            || get_chunk_parent_type(prev) == CT_CLASS))
-      {
-         auto &opt = (get_chunk_parent_type(prev) == CT_CLASS
+      if (  (  prev->Is(CT_SEMICOLON)
+            || prev->Is(CT_BRACE_CLOSE))
+         && (  prev->GetParentType() == CT_STRUCT
+            || prev->GetParentType() == CT_ENUM
+            || prev->GetParentType() == CT_UNION
+            || prev->GetParentType() == CT_CLASS))
+      {
+         auto &opt = (prev->GetParentType() == CT_CLASS
          ? options::nl_after_class
          : options::nl_after_struct);
          log_rule_B("nl_after_class");
          log_rule_B("nl_after_struct");
 
-         if (opt() > pc->nl_count)
+         if (opt() > pc->GetNlCount())
          {
             // Issue #1702
             // look back if we have a variable
@@ -6341,22 +6465,22 @@ void do_blank_lines(void)
 
             while ((tmp = tmp->GetPrev())->IsNotNullChunk())
             {
-               if (tmp->level > pc->level)
+               if (tmp->GetLevel() > pc->GetLevel())
                {
                   continue;
                }
                LOG_FMT(LBLANK, "%s(%d): %zu:%zu token is '%s'\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
+                       __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(), tmp->Text());
 
-               if (tmp->flags.test(PCF_VAR_DEF))
+               if (tmp->TestFlags(PCF_VAR_DEF))
                {
                   is_var_def = true;
                   break;
                }
 
-               if (chunk_is_token(tmp, get_chunk_parent_type(prev)))
+               if (tmp->Is(prev->GetParentType()))
                {
-                  is_fwd_decl = tmp->flags.test(PCF_INCOMPLETE);
+                  is_fwd_decl = tmp->TestFlags(PCF_INCOMPLETE);
                   break;
                }
             }
@@ -6375,15 +6499,15 @@ void do_blank_lines(void)
 
       // Change blanks between a function comment and body
       if (  (options::nl_comment_func_def() != 0)
-         && chunk_is_token(pcmt, CT_COMMENT_MULTI)
-         && get_chunk_parent_type(pcmt) == CT_COMMENT_WHOLE
+         && pcmt->Is(CT_COMMENT_MULTI)
+         && pcmt->GetParentType() == CT_COMMENT_WHOLE
          && next->IsNotNullChunk()
-         && (  get_chunk_parent_type(next) == CT_FUNC_DEF
-            || get_chunk_parent_type(next) == CT_FUNC_CLASS_DEF))
+         && (  next->GetParentType() == CT_FUNC_DEF
+            || next->GetParentType() == CT_FUNC_CLASS_DEF))
       {
          log_rule_B("nl_comment_func_def");
 
-         if (options::nl_comment_func_def() != pc->nl_count)
+         if (options::nl_comment_func_def() != pc->GetNlCount())
          {
             log_rule_B("nl_comment_func_def");
             blank_line_set(pc, options::nl_comment_func_def);
@@ -6392,19 +6516,19 @@ void do_blank_lines(void)
 
       // Change blanks after a try-catch-finally block
       if (  (options::nl_after_try_catch_finally() != 0)
-         && (options::nl_after_try_catch_finally() != pc->nl_count)
-         && prev != nullptr
+         && (options::nl_after_try_catch_finally() != pc->GetNlCount())
+         && prev->IsNotNullChunk()
          && next->IsNotNullChunk())
       {
          log_rule_B("nl_after_try_catch_finally");
 
-         if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-            && (  get_chunk_parent_type(prev) == CT_CATCH
-               || get_chunk_parent_type(prev) == CT_FINALLY))
+         if (  prev->Is(CT_BRACE_CLOSE)
+            && (  prev->GetParentType() == CT_CATCH
+               || prev->GetParentType() == CT_FINALLY))
          {
-            if (  chunk_is_not_token(next, CT_BRACE_CLOSE)
-               && chunk_is_not_token(next, CT_CATCH)
-               && chunk_is_not_token(next, CT_FINALLY))
+            if (  next->IsNot(CT_BRACE_CLOSE)
+               && next->IsNot(CT_CATCH)
+               && next->IsNot(CT_FINALLY))
             {
                blank_line_set(pc, options::nl_after_try_catch_finally);
                log_rule_B("nl_after_try_catch_finally");
@@ -6414,16 +6538,16 @@ void do_blank_lines(void)
 
       // Change blanks after a try-catch-finally block
       if (  (options::nl_between_get_set() != 0)
-         && (options::nl_between_get_set() != pc->nl_count)
-         && prev != nullptr
+         && (options::nl_between_get_set() != pc->GetNlCount())
+         && prev->IsNotNullChunk()
          && next->IsNotNullChunk())
       {
          log_rule_B("nl_between_get_set");
 
-         if (  get_chunk_parent_type(prev) == CT_GETSET
-            && chunk_is_not_token(next, CT_BRACE_CLOSE)
-            && (  chunk_is_token(prev, CT_BRACE_CLOSE)
-               || chunk_is_token(prev, CT_SEMICOLON)))
+         if (  prev->GetParentType() == CT_GETSET
+            && next->IsNot(CT_BRACE_CLOSE)
+            && (  prev->Is(CT_BRACE_CLOSE)
+               || prev->Is(CT_SEMICOLON)))
          {
             blank_line_set(pc, options::nl_between_get_set);
             log_rule_B("nl_between_get_set");
@@ -6432,21 +6556,21 @@ void do_blank_lines(void)
 
       // Change blanks after a try-catch-finally block
       if (  (options::nl_around_cs_property() != 0)
-         && (options::nl_around_cs_property() != pc->nl_count)
-         && prev != nullptr
+         && (options::nl_around_cs_property() != pc->GetNlCount())
+         && prev->IsNotNullChunk()
          && next->IsNotNullChunk())
       {
          log_rule_B("nl_around_cs_property");
 
-         if (  chunk_is_token(prev, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(prev) == CT_CS_PROPERTY
-            && chunk_is_not_token(next, CT_BRACE_CLOSE))
+         if (  prev->Is(CT_BRACE_CLOSE)
+            && prev->GetParentType() == CT_CS_PROPERTY
+            && next->IsNot(CT_BRACE_CLOSE))
          {
             blank_line_set(pc, options::nl_around_cs_property);
             log_rule_B("nl_around_cs_property");
          }
-         else if (  get_chunk_parent_type(next) == CT_CS_PROPERTY
-                 && next->flags.test(PCF_STMT_START))
+         else if (  next->GetParentType() == CT_CS_PROPERTY
+                 && next->TestFlags(PCF_STMT_START))
          {
             blank_line_set(pc, options::nl_around_cs_property);
             log_rule_B("nl_around_cs_property");
@@ -6455,15 +6579,15 @@ void do_blank_lines(void)
 
       // Control blanks before an access spec
       if (  (options::nl_before_access_spec() > 0)
-         && (options::nl_before_access_spec() != pc->nl_count)
-         && chunk_is_token(next, CT_ACCESS))
+         && (options::nl_before_access_spec() != pc->GetNlCount())
+         && next->Is(CT_ACCESS))
       {
          log_rule_B("nl_before_access_spec");
 
          // Don't add blanks after an open brace
-         if (  prev == nullptr
-            || (  chunk_is_not_token(prev, CT_BRACE_OPEN)
-               && chunk_is_not_token(prev, CT_VBRACE_OPEN)))
+         if (  prev->IsNullChunk()
+            || (  prev->IsNot(CT_BRACE_OPEN)
+               && prev->IsNot(CT_VBRACE_OPEN)))
          {
             log_rule_B("nl_before_access_spec");
             blank_line_set(pc, options::nl_before_access_spec);
@@ -6472,11 +6596,11 @@ void do_blank_lines(void)
 
       // Change blanks inside namespace braces
       if (  (options::nl_inside_namespace() != 0)
-         && (options::nl_inside_namespace() != pc->nl_count)
-         && (  (  chunk_is_token(prev, CT_BRACE_OPEN)
-               && get_chunk_parent_type(prev) == CT_NAMESPACE)
-            || (  chunk_is_token(next, CT_BRACE_CLOSE)
-               && get_chunk_parent_type(next) == CT_NAMESPACE)))
+         && (options::nl_inside_namespace() != pc->GetNlCount())
+         && (  (  prev->Is(CT_BRACE_OPEN)
+               && prev->GetParentType() == CT_NAMESPACE)
+            || (  next->Is(CT_BRACE_CLOSE)
+               && next->GetParentType() == CT_NAMESPACE)))
       {
          log_rule_B("nl_inside_namespace");
          blank_line_set(pc, options::nl_inside_namespace);
@@ -6484,11 +6608,11 @@ void do_blank_lines(void)
 
       // Control blanks before a whole-file #ifdef
       if (  options::nl_before_whole_file_ifdef() != 0
-         && options::nl_before_whole_file_ifdef() != pc->nl_count
-         && chunk_is_token(next, CT_PREPROC)
-         && get_chunk_parent_type(next) == CT_PP_IF
+         && options::nl_before_whole_file_ifdef() != pc->GetNlCount()
+         && next->Is(CT_PREPROC)
+         && next->GetParentType() == CT_PP_IF
          && ifdef_over_whole_file()
-         && next->flags.test(PCF_WF_IF))
+         && next->TestFlags(PCF_WF_IF))
       {
          log_rule_B("nl_before_whole_file_ifdef");
          blank_line_set(pc, options::nl_before_whole_file_ifdef);
@@ -6496,14 +6620,14 @@ void do_blank_lines(void)
 
       // Control blanks after a whole-file #ifdef
       if (  options::nl_after_whole_file_ifdef() != 0
-         && options::nl_after_whole_file_ifdef() != pc->nl_count)
+         && options::nl_after_whole_file_ifdef() != pc->GetNlCount())
       {
-         Chunk *pp_start = chunk_get_pp_start(prev);
+         Chunk *pp_start = prev->GetPpStart();
 
-         if (  pp_start != nullptr
-            && get_chunk_parent_type(pp_start) == CT_PP_IF
+         if (  pp_start->IsNotNullChunk()
+            && pp_start->GetParentType() == CT_PP_IF
             && ifdef_over_whole_file()
-            && pp_start->flags.test(PCF_WF_IF))
+            && pp_start->TestFlags(PCF_WF_IF))
          {
             log_rule_B("nl_after_whole_file_ifdef");
             blank_line_set(pc, options::nl_after_whole_file_ifdef);
@@ -6512,11 +6636,11 @@ void do_blank_lines(void)
 
       // Control blanks before a whole-file #endif
       if (  options::nl_before_whole_file_endif() != 0
-         && options::nl_before_whole_file_endif() != pc->nl_count
-         && chunk_is_token(next, CT_PREPROC)
-         && get_chunk_parent_type(next) == CT_PP_ENDIF
+         && options::nl_before_whole_file_endif() != pc->GetNlCount()
+         && next->Is(CT_PREPROC)
+         && next->GetParentType() == CT_PP_ENDIF
          && ifdef_over_whole_file()
-         && next->flags.test(PCF_WF_ENDIF))
+         && next->TestFlags(PCF_WF_ENDIF))
       {
          log_rule_B("nl_before_whole_file_endif");
          blank_line_set(pc, options::nl_before_whole_file_endif);
@@ -6524,14 +6648,14 @@ void do_blank_lines(void)
 
       // Control blanks after a whole-file #endif
       if (  options::nl_after_whole_file_endif() != 0
-         && options::nl_after_whole_file_endif() != pc->nl_count)
+         && options::nl_after_whole_file_endif() != pc->GetNlCount())
       {
-         Chunk *pp_start = chunk_get_pp_start(prev);
+         Chunk *pp_start = prev->GetPpStart();
 
-         if (  pp_start != nullptr
-            && get_chunk_parent_type(pp_start) == CT_PP_ENDIF
+         if (  pp_start->IsNotNullChunk()
+            && pp_start->GetParentType() == CT_PP_ENDIF
             && ifdef_over_whole_file()
-            && pp_start->flags.test(PCF_WF_ENDIF))
+            && pp_start->TestFlags(PCF_WF_ENDIF))
          {
             log_rule_B("nl_after_whole_file_endif");
             blank_line_set(pc, options::nl_after_whole_file_endif);
@@ -6539,19 +6663,19 @@ void do_blank_lines(void)
       }
 
       if (  line_added
-         && pc->nl_count > 1)
+         && pc->GetNlCount() > 1)
       {
-         --pc->nl_count;
-         LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text is '%s', -- nl_count is now %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), pc->nl_count);
+         pc->SetNlCount(pc->GetNlCount() - 1);
+         LOG_FMT(LBLANK, "%s(%d): orig line is %zu, orig col is %zu, text is '%s', new line count is now %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), pc->GetNlCount());
       }
-      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text is '%s', end nl_count is now %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), pc->nl_count);
+      LOG_FMT(LBLANK, "%s(%d): orig line is %zu, orig col is %zu, text is '%s', end new line count is now %zu\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), pc->GetNlCount());
    }
 } // do_blank_lines
 
 
-void newlines_cleanup_dup(void)
+void newlines_cleanup_dup()
 {
    LOG_FUNC_ENTRY();
 
@@ -6562,11 +6686,11 @@ void newlines_cleanup_dup(void)
    {
       next = next->GetNext();
 
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         && chunk_is_token(next, CT_NEWLINE))
+      if (  pc->Is(CT_NEWLINE)
+         && next->Is(CT_NEWLINE))
       {
-         next->nl_count = max(pc->nl_count, next->nl_count);
-         chunk_del(pc);
+         next->SetNlCount(max(pc->GetNlCount(), next->GetNlCount()));
+         Chunk::Delete(pc);
          MARK_CHANGE();
       }
       pc = next;
@@ -6586,14 +6710,14 @@ static void newlines_enum_entries(Chunk *open_brace, iarf_e av)
    }
 
    while (  (pc = pc->GetNextNc())->IsNotNullChunk()
-         && pc->level > open_brace->level)
+         && pc->GetLevel() > open_brace->GetLevel())
    {
-      if (  (pc->level != (open_brace->level + 1))
-         || chunk_is_not_token(pc, CT_COMMA)
-         || (  chunk_is_token(pc, CT_COMMA)
+      if (  (pc->GetLevel() != (open_brace->GetLevel() + 1))
+         || pc->IsNot(CT_COMMA)
+         || (  pc->Is(CT_COMMA)
             && pc->GetNext()->IsNotNullChunk()
-            && (  pc->GetNext()->type == CT_COMMENT_CPP
-               || pc->GetNext()->type == CT_COMMENT)))
+            && (  pc->GetNext()->GetType() == CT_COMMENT_CPP
+               || pc->GetNext()->GetType() == CT_COMMENT)))
       {
          continue;
       }
@@ -6615,10 +6739,10 @@ static void newlines_double_space_struct_enum_union(Chunk *open_brace)
    }
 
    while (  (pc = pc->GetNextNc())->IsNotNullChunk()
-         && pc->level > open_brace->level)
+         && pc->GetLevel() > open_brace->GetLevel())
    {
-      if (  pc->level != (open_brace->level + 1)
-         || chunk_is_not_token(pc, CT_NEWLINE))
+      if (  pc->GetLevel() != (open_brace->GetLevel() + 1)
+         || pc->IsNot(CT_NEWLINE))
       {
          continue;
       }
@@ -6630,10 +6754,10 @@ static void newlines_double_space_struct_enum_union(Chunk *open_brace)
       Chunk *prev = pc->GetPrev();
 
       if (  !prev->IsComment()
-         && chunk_is_not_token(prev, CT_BRACE_OPEN)
+         && prev->IsNot(CT_BRACE_OPEN)
          && pc->GetNext()->IsComment())
       {
-         if (pc->nl_count < 2)
+         if (pc->GetNlCount() < 2)
          {
             double_newline(pc);
          }
@@ -6642,7 +6766,7 @@ static void newlines_double_space_struct_enum_union(Chunk *open_brace)
 } // newlines_double_space_struct_enum_union
 
 
-void annotations_newlines(void)
+void annotations_newlines()
 {
    LOG_FUNC_ENTRY();
 
@@ -6651,14 +6775,14 @@ void annotations_newlines(void)
    Chunk *ae;   // last token of the annotation
    Chunk *pc = Chunk::GetHead();
 
-   while (  (pc = pc->GetNextType(CT_ANNOTATION, -1))->IsNotNullChunk()
+   while (  (pc = pc->GetNextType(CT_ANNOTATION))->IsNotNullChunk()
          && (next = pc->GetNextNnl())->IsNotNullChunk())
    {
       // find the end of this annotation
-      if (chunk_is_paren_open(next))
+      if (next->IsParenOpen())
       {
          // TODO: control newline between annotation and '(' ?
-         ae = chunk_skip_to_match(next);
+         ae = next->GetClosingParen();
       }
       else
       {
@@ -6669,16 +6793,16 @@ void annotations_newlines(void)
       {
          break;
       }
-      LOG_FMT(LANNOT, "%s(%d): orig_line is %zu, orig_col is %zu, annotation is '%s',  end @ orig_line %zu, orig_col %zu, is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
-              ae->orig_line, ae->orig_col, ae->Text());
+      LOG_FMT(LANNOT, "%s(%d): orig line is %zu, orig col is %zu, annotation is '%s',  end @ orig line %zu, orig col %zu, is '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(),
+              ae->GetOrigLine(), ae->GetOrigCol(), ae->Text());
 
       prev = ae->GetPrev();             // Issue #1845
-      LOG_FMT(LANNOT, "%s(%d): prev->orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-              __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text());
+      LOG_FMT(LANNOT, "%s(%d): prev orig line is %zu, orig col is %zu, Text() is '%s'\n",
+              __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text());
       next = ae->GetNextNnl();
 
-      if (chunk_is_token(next, CT_ANNOTATION))
+      if (next->Is(CT_ANNOTATION))
       {
          LOG_FMT(LANNOT, "%s(%d):  -- nl_between_annotation\n",
                  __func__, __LINE__);
@@ -6686,9 +6810,9 @@ void annotations_newlines(void)
          log_rule_B("nl_between_annotation");
       }
 
-      if (chunk_is_token(next, CT_NEWLINE))
+      if (next->Is(CT_NEWLINE))
       {
-         if (chunk_is_token(next, CT_ANNOTATION))
+         if (next->Is(CT_ANNOTATION))
          {
             LOG_FMT(LANNOT, "%s(%d):  -- nl_after_annotation\n",
                     __func__, __LINE__);
@@ -6713,7 +6837,7 @@ bool newlines_between(Chunk *pc_start, Chunk *pc_end, size_t &newlines, E_Scope
 
    for ( ; it->IsNotNullChunk() && it != pc_end; it = it->GetNext(scope))
    {
-      newlines += it->nl_count;
+      newlines += it->GetNlCount();
    }
 
    // newline count is valid if search stopped on expected chunk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.h
index b5c7db03..f75d6ad5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.h
@@ -20,7 +20,7 @@ void double_newline(Chunk *nl);
  * Remove all extra newlines.
  * Modify line breaks as needed.
  */
-void newlines_remove_newlines(void);
+void newlines_remove_newlines();
 
 
 /**
@@ -42,17 +42,17 @@ void newlines_cleanup_angles();
 
 
 //! Handle insertion/removal of blank lines before if/for/while/do and functions
-void newlines_insert_blank_lines(void);
+void newlines_insert_blank_lines();
 
 
 /**
  * Handle removal of extra blank lines in functions
  * x <= 0: do nothing, x > 0: allow max x-1 blank lines
  */
-void newlines_functions_remove_extra_blank_lines(void);
+void newlines_functions_remove_extra_blank_lines();
 
 
-void newlines_squeeze_ifdef(void);
+void newlines_squeeze_ifdef();
 
 /**
  * In case of consecutive closing parens, which follow a newline,
@@ -74,11 +74,11 @@ void newlines_squeeze_ifdef(void);
  *    )
  * ));
  */
-void newlines_squeeze_paren_close(void);
+void newlines_squeeze_paren_close();
 
 
 //! removes unnecessary newlines at start and end of a file
-void newlines_eat_start_end(void);
+void newlines_eat_start_end();
 
 
 /**
@@ -97,17 +97,17 @@ void newlines_chunk_pos(E_Token chunk_type, uncrustify::token_pos_e mode);
 void newlines_class_colon_pos(E_Token tok);
 
 
-void newlines_cleanup_dup(void);
+void newlines_cleanup_dup();
 
 
-void annotations_newlines(void);
+void annotations_newlines();
 
 
-void newline_after_multiline_comment(void);
+void newline_after_multiline_comment();
 
 
 //! Handle insertion of blank lines after label colons
-void newline_after_label_colon(void);
+void newline_after_label_colon();
 
 
 /**
@@ -117,7 +117,7 @@ void newline_after_label_colon(void);
  * first chunk.
  * So, most comparisons have +1 below.
  */
-void do_blank_lines(void);
+void do_blank_lines();
 
 
 /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.cpp
index 8160c22b..ea29d065 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.cpp
@@ -266,7 +266,7 @@ bool is_path_relative(const std::string &path)
       return(false);
    }
 
-   // Check for double backslashs as indication for a network path
+   // Check for double backslashes as indication for a network path
    // '\\server\path\to\file style' absolute UNC path
    if (  path.size() > 1
       && path[0] == '\\'
@@ -326,8 +326,7 @@ bool process_option_line_compat_0_68(const std::string              &cmd,
 } // process_option_line_compat_0_68
 
 
-bool process_option_line_compat_0_70(const std::string &cmd,
-                                     const char        *filename)
+bool process_option_line_compat_0_70(const std::string &cmd, const char *filename)
 {
    if (cmd == "sp_word_brace")                     // Issue #2428
    {
@@ -342,8 +341,7 @@ bool process_option_line_compat_0_70(const std::string &cmd,
 } // process_option_line_compat_0_70
 
 
-bool process_option_line_compat_0_73(const std::string &cmd,
-                                     const char        *filename)
+bool process_option_line_compat_0_73(const std::string &cmd, const char *filename)
 {
    if (cmd == "indent_sing_line_comments")         // Issue #3249
    {
@@ -378,8 +376,7 @@ bool process_option_line_compat_0_73(const std::string &cmd,
 } // process_option_line_compat_0_73
 
 
-bool process_option_line_compat_0_74(const std::string &cmd,
-                                     const char        *filename)
+bool process_option_line_compat_0_74(const std::string &cmd, const char *filename)
 {
    if (cmd == "sp_type_question")         // PR #3638
    {
@@ -392,6 +389,47 @@ bool process_option_line_compat_0_74(const std::string &cmd,
    return(false);
 } // process_option_line_compat_0_74
 
+
+bool process_option_line_compat_0_75(const std::string &cmd, const char *filename)
+{
+   if (cmd == "pp_space")
+   {
+      OptionWarning w{ filename, OptionWarning::MINOR };
+      w("option '%s' is deprecated; it has been replaced by '%s'.",
+        cmd.c_str(), options::pp_space_after.name());
+
+      return(true);
+   }
+
+   if (cmd == "pp_space_before")
+   {
+      OptionWarning w{ filename, OptionWarning::MINOR };
+      w("option '%s' is deprecated; it was a temporary option used\n"
+        "during the development of version 0.76. Use '%s' and '%s' instead.",
+        cmd.c_str(), options::pp_indent.name(), options::pp_indent_count.name());
+
+      return(true);
+   }
+   return(false);
+} // process_option_line_compat_0_75
+
+
+bool process_option_line_compat_0_76(const std::string &cmd, const std::vector<std::string> &args, const char *filename)
+{
+   if (cmd == "nl_func_var_def_blk")
+   {
+      OptionWarning w{ filename, OptionWarning::MINOR };
+      w("option '%s' is deprecated; it has been replaced by '%s'.\n"
+        "You can also use '%s' for additional functionality",
+        cmd.c_str(), options::nl_var_def_blk_end_func_top.name(),
+        options::nl_var_def_blk_end.name());
+
+      UNUSED(options::nl_var_def_blk_end_func_top.read(args[1].c_str()));
+      return(true);
+   }
+   return(false);
+} // process_option_line_compat_0_76
+
 } // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -402,10 +440,7 @@ bool process_option_line_compat_0_74(const std::string &cmd,
 //-----------------------------------------------------------------------------
 OptionWarning::OptionWarning(const char *filename, Severity severity)
 {
-   if (severity != MINOR)
-   {
-      ++cpd.error_count;
-   }
+   UNUSED(severity);
 
    if (cpd.line_number != 0)
    {
@@ -421,10 +456,8 @@ OptionWarning::OptionWarning(const char *filename, Severity severity)
 //-----------------------------------------------------------------------------
 OptionWarning::OptionWarning(const GenericOption *opt, Severity severity)
 {
-   if (severity != MINOR)
-   {
-      ++cpd.error_count;
-   }
+   UNUSED(severity);
+
    fprintf(stderr, "Option<%s>: at %s:%d: ", to_string(opt->type()),
            cpd.filename.c_str(), cpd.line_number);
 }
@@ -1089,6 +1122,22 @@ void process_option_line(const std::string &config_line, const char *filename,
             return;
          }
       }
+
+      if (compat_level < option_level(0, 76))
+      {
+         if (process_option_line_compat_0_75(cmd, filename))
+         {
+            return;
+         }
+      }
+
+      if (compat_level < option_level(0, 77))
+      {
+         if (process_option_line_compat_0_76(cmd, args, filename))
+         {
+            return;
+         }
+      }
       const auto oi = option_map.find(cmd);
 
       if (oi == option_map.end())
@@ -1125,7 +1174,7 @@ bool load_option_file(const char *filename, int compat_level)
       OptionWarning w{ filename };
       w("file could not be opened: %s (%d)\n",
         strerror(errno), errno);
-      return(false);
+      exit(EX_SOFTWARE);
    }
    // Read in the file line by line
    std::string line;
@@ -1153,7 +1202,7 @@ bool load_option_file(const char *filename, int compat_level)
             // error
             // related to PR #3298
             fprintf(stderr, "%s: line %u: Character at position %zu, is not printable.\n", filename, cpd.line_number + 1, n + 1);
-            return(false);
+            exit(EX_SOFTWARE);
          }
       }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.h
index 4ab356b5..7b961940 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.h
@@ -316,7 +316,7 @@ GenericOption *find_option(const char *name);
 
 
 //! Add all uncrustify options to the global option registry
-void register_options(void);
+void register_options();
 
 
 OptionGroup *get_option_group(size_t);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.cpp.in
index aeb976b2..aeb976b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.cpp.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.h.in
index e50a9281..e50a9281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.cpp.in
index 2ee14c8b..2ee14c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.cpp.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.h
index d3e5386d..7fabf1f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.h
@@ -567,17 +567,17 @@ sp_after_comma;
 extern Option<iarf_e>
 sp_before_comma; // = IARF_REMOVE
 
-// (C#) Add or remove space between ',' and ']' in multidimensional array type
+// (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
 // like 'int[,,]'.
 extern Option<iarf_e>
 sp_after_mdatype_commas;
 
-// (C#) Add or remove space between '[' and ',' in multidimensional array type
+// (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
 // like 'int[,,]'.
 extern Option<iarf_e>
 sp_before_mdatype_commas;
 
-// (C#) Add or remove space between ',' in multidimensional array type
+// (C#, Vala) Add or remove space between ',' in multidimensional array type
 // like 'int[,,]'.
 extern Option<iarf_e>
 sp_between_mdatype_commas;
@@ -1224,7 +1224,7 @@ sp_between_new_paren;
 extern Option<iarf_e>
 sp_after_newop_paren;
 
-// Add or remove space inside parenthesis of the new operator
+// Add or remove space inside parentheses of the new operator
 // as in 'new(foo) BAR'.
 extern Option<iarf_e>
 sp_inside_newop_paren;
@@ -1848,7 +1848,7 @@ indent_using_block; // = true
 // How to indent the continuation of ternary operator.
 //
 // 0: Off (default)
-// 1: When the `if_false` is a continuation, indent it under `if_false`
+// 1: When the `if_false` is a continuation, indent it under the `if_true` branch
 // 2: When the `:` is a continuation, indent it under `?`
 extern BoundedOption<unsigned, 0, 2>
 indent_ternary_operator;
@@ -1884,11 +1884,17 @@ donot_indent_func_def_close_paren;
 ///////////////////////////////////////////////////////////////////////////////
 //BEGIN Newline adding and removing options
 
-// Whether to collapse empty blocks between '{' and '}'.
-// If true, overrides nl_inside_empty_func
+// Whether to collapse empty blocks between '{' and '}' except for functions.
+// Use nl_collapse_empty_body_functions to specify how empty function braces
+// should be formatted.
 extern Option<bool>
 nl_collapse_empty_body;
 
+// Whether to collapse empty blocks between '{' and '}' for functions only.
+// If true, overrides nl_inside_empty_func.
+extern Option<bool>
+nl_collapse_empty_body_functions;
+
 // Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
 extern Option<bool>
 nl_assign_leave_one_liners;
@@ -2470,6 +2476,14 @@ nl_template_end;
 extern Option<bool>
 nl_oc_msg_args;
 
+// (OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.
+extern BoundedOption<unsigned, 0, 16>
+nl_oc_msg_args_min_params;
+
+// (OC) Max code width of Objective-C message before applying nl_oc_msg_args.
+extern BoundedOption<unsigned, 0, 10000>
+nl_oc_msg_args_max_code_width;
+
 // Add or remove newline between function signature and '{'.
 extern Option<iarf_e>
 nl_fdef_brace;
@@ -2487,6 +2501,10 @@ nl_cpp_ldef_brace;
 extern Option<iarf_e>
 nl_return_expr;
 
+// Add or remove newline between 'throw' and the throw expression.
+extern Option<iarf_e>
+nl_throw_expr;
+
 // Whether to add a newline after semicolons, except in 'for' statements.
 extern Option<bool>
 nl_after_semicolon;
@@ -2731,7 +2749,7 @@ nl_max_blank_in_func;
 // The number of newlines inside an empty function body.
 // This option overrides eat_blanks_after_open_brace and
 // eat_blanks_before_close_brace, but is ignored when
-// nl_collapse_empty_body=true
+// nl_collapse_empty_body_functions=true
 extern BoundedOption<unsigned, 0, 16>
 nl_inside_empty_func;
 
@@ -2796,13 +2814,6 @@ nl_after_func_body_class;
 extern BoundedOption<unsigned, 0, 16>
 nl_after_func_body_one_liner;
 
-// The number of blank lines after a block of variable definitions at the top
-// of a function body.
-//
-// 0: No change (default).
-extern BoundedOption<unsigned, 0, 16>
-nl_func_var_def_blk;
-
 // The number of newlines before a block of typedefs. If nl_after_access_spec
 // is non-zero, that option takes precedence.
 //
@@ -2822,16 +2833,29 @@ nl_typedef_blk_end;
 extern BoundedOption<unsigned, 0, 16>
 nl_typedef_blk_in;
 
-// The number of empty newlines before a block of variable definitions
+// The minimum number of blank lines after a block of variable definitions
+// at the top of a function body. If any preprocessor directives appear
+// between the opening brace of the function and the variable block, then
+// it is considered as not at the top of the function.Newlines are added
+// before trailing preprocessor directives, if any exist.
+//
+// 0: No change (default).
+extern BoundedOption<unsigned, 0, 16>
+nl_var_def_blk_end_func_top;
+
+// The minimum number of empty newlines before a block of variable definitions
 // not at the top of a function body. If nl_after_access_spec is non-zero,
-// that option takes precedence.
+// that option takes precedence. Newlines are not added at the top of the
+// file or just after an opening brace. Newlines are added above any
+// preprocessor directives before the block.
 //
 // 0: No change (default).
 extern BoundedOption<unsigned, 0, 16>
 nl_var_def_blk_start;
 
-// The number of empty newlines after a block of variable definitions
-// not at the top of a function body.
+// The minimum number of empty newlines after a block of variable definitions
+// not at the top of a function body. Newlines are not added if the block
+// is at the bottom of the file or just before a preprocessor directive.
 //
 // 0: No change (default).
 extern BoundedOption<unsigned, 0, 16>
@@ -3221,12 +3245,6 @@ align_var_def_inline;
 extern BoundedOption<unsigned, 0, 5000>
 align_assign_span;
 
-// The span for aligning on '{' in braced init list.
-//
-// 0: Don't align (default).
-extern BoundedOption<unsigned, 0, 5000>
-align_braced_init_list_span;
-
 // The span for aligning on '=' in function prototype modifier.
 //
 // 0: Don't align (default).
@@ -3246,6 +3264,12 @@ align_assign_thresh;
 extern Option<bool>
 align_assign_on_multi_var_defs;
 
+// The span for aligning on '{' in braced init list.
+//
+// 0: Don't align (default).
+extern BoundedOption<unsigned, 0, 5000>
+align_braced_init_list_span;
+
 // The threshold for aligning on '{' in braced init list.
 // Use a negative number for absolute thresholds.
 //
@@ -3779,10 +3803,14 @@ mod_full_brace_nl;
 extern Option<bool>
 mod_full_brace_nl_block_rem_mlcond;
 
-// Add or remove unnecessary parenthesis on 'return' statement.
+// Add or remove unnecessary parentheses on 'return' statement.
 extern Option<iarf_e>
 mod_paren_on_return;
 
+// Add or remove unnecessary parentheses on 'throw' statement.
+extern Option<iarf_e>
+mod_paren_on_throw;
+
 // (Pawn) Whether to change optional semicolons to real semicolons.
 extern Option<bool>
 mod_pawn_semicolon;
@@ -3906,6 +3934,59 @@ mod_remove_empty_return;
 extern Option<iarf_e>
 mod_enum_last_comma;
 
+// Syntax to use for infinite loops.
+//
+// 0: Leave syntax alone (default)
+// 1: Rewrite as `for(;;)`
+// 2: Rewrite as `while(true)`
+// 3: Rewrite as `do`...`while(true);`
+// 4: Rewrite as `while(1)`
+// 5: Rewrite as `do`...`while(1);`
+//
+// Infinite loops that do not already match one of these syntaxes are ignored.
+// Other options that affect loop formatting will be applied after transforming
+// the syntax.
+extern BoundedOption<unsigned, 0, 5>
+mod_infinite_loop;
+
+// Add or remove the 'int' keyword in 'int short'.
+extern Option<iarf_e>
+mod_int_short;
+
+// Add or remove the 'int' keyword in 'short int'.
+extern Option<iarf_e>
+mod_short_int;
+
+// Add or remove the 'int' keyword in 'int long'.
+extern Option<iarf_e>
+mod_int_long;
+
+// Add or remove the 'int' keyword in 'long int'.
+extern Option<iarf_e>
+mod_long_int;
+
+// Add or remove the 'int' keyword in 'int signed'.
+extern Option<iarf_e>
+mod_int_signed;
+
+// Add or remove the 'int' keyword in 'signed int'.
+extern Option<iarf_e>
+mod_signed_int;
+
+// Add or remove the 'int' keyword in 'int unsigned'.
+extern Option<iarf_e>
+mod_int_unsigned;
+
+// Add or remove the 'int' keyword in 'unsigned int'.
+extern Option<iarf_e>
+mod_unsigned_int;
+
+// If there is a situation where mod_int_* and mod_*_int would result in
+// multiple int keywords, whether to keep the rightmost int (the default) or the
+// leftmost int.
+extern Option<bool>
+mod_int_prefer_int_on_left;
+
 // (OC) Whether to organize the properties. If true, properties will be
 // rearranged according to the mod_sort_oc_property_*_weight factors.
 extern Option<bool>
@@ -3946,6 +4027,15 @@ mod_sort_oc_property_nullability_weight;
 ///////////////////////////////////////////////////////////////////////////////
 //BEGIN Preprocessor options
 
+// How to use tabs when indenting preprocessor code.
+//
+// -1: Use 'indent_with_tabs' setting (default)
+//  0: Spaces only
+//  1: Indent with tabs to brace level, align with spaces
+//  2: Indent and align with tabs, using spaces when not on a tabstop
+extern BoundedOption<signed, -1, 2>
+pp_indent_with_tabs; // = -1
+
 // Add or remove indentation of preprocessor directives inside #if blocks
 // at brace level 0 (file-level).
 extern Option<iarf_e>
@@ -3968,11 +4058,11 @@ pp_indent_at_level0;
 extern BoundedOption<unsigned, 0, 16>
 pp_indent_count; // = 1
 
-// Add or remove space after # based on pp_level of #if blocks.
+// Add or remove space after # based on pp level of #if blocks.
 extern Option<iarf_e>
-pp_space;
+pp_space_after;
 
-// Sets the number of spaces per level added with pp_space.
+// Sets the number of spaces per level added with pp_space_after.
 extern BoundedOption<unsigned, 0, 16>
 pp_space_count;
 
@@ -4014,30 +4104,41 @@ pp_include_at_level;
 extern Option<bool>
 pp_ignore_define_body;
 
+// An offset value that controls the indentation of the body of a multiline #define.
+// 'body' refers to all the lines of a multiline #define except the first line.
+// Requires 'pp_ignore_define_body = false'.
+//
+//  <0: Absolute column: the body indentation starts off at the specified column
+//      (ex. -3 ==> the body is indented starting from column 3)
+// >=0: Relative to the column of the '#' of '#define'
+//      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
+extern BoundedOption<signed, -32, 32>
+pp_multiline_define_body_indent; // = 8
+
 // TODO The following descriptions are confusing and suffer from sub-optimal
 // grammar, and should be revised; from here...
 
 // Whether to indent case statements between #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the case statements
+// Only applies to the indent of the preprocessor that the case statements
 // directly inside of.
 extern Option<bool>
 pp_indent_case; // = true
 
 // Whether to indent whole function definitions between #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the function definition
+// Only applies to the indent of the preprocessor that the function definition
 // is directly inside of.
 extern Option<bool>
 pp_indent_func_def; // = true
 
 // Whether to indent extern C blocks between #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the extern block is
+// Only applies to the indent of the preprocessor that the extern block is
 // directly inside of.
 extern Option<bool>
 pp_indent_extern; // = true
 
 // How to indent braces directly inside #if, #else, and #endif.
 // Requires pp_if_indent_code=true and only applies to the indent of the
-// preprocesser that the braces are directly inside of.
+// preprocessor that the braces are directly inside of.
 //  0: No extra indent
 //  1: Indent by one level
 // -1: Preserve original indentation
@@ -4117,10 +4218,10 @@ use_indent_continue_only_once;
 
 // The indentation can be:
 // - after the assignment, at the '[' character
-// - at the begin of the lambda body
+// - at the beginning of the lambda body
 //
-// true:  indentation will be after the assignment
-// false: indentation will be at the begin of the lambda body (default)
+// true:  indentation will be at the beginning of the lambda body
+// false: indentation will be after the assignment (default)
 extern Option<bool>
 indent_cpp_lambda_only_once;
 
@@ -4180,6 +4281,19 @@ debug_timeout;
 extern BoundedOption<unsigned, 0, 960>
 debug_truncate;
 
+// sort (or not) the tracking info.
+extern Option<bool>
+debug_sort_the_tracks;  // = true
+
+// decode (or not) the flags as a new line.
+// only if the -p option is set.
+extern Option<bool>
+debug_decode_the_flags;
+
+// insert the number of the line at the beginning of each line
+extern Option<bool>
+set_numbering_for_html_output;
+
 //END
 
 } // namespace options
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.cpp
index f4a1d040..c0a178f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.cpp
@@ -107,7 +107,7 @@ void save_set_options_for_QT(size_t level)
 
 
 //-----------------------------------------------------------------------------
-void restore_options_for_QT(void)
+void restore_options_for_QT()
 {
    log_rule_B("use_options_overriding_for_qt_macros");
    assert(options::use_options_overriding_for_qt_macros());
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.h
index c114eb75..1b8bfccf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.h
@@ -23,7 +23,7 @@ extern bool   restoreValues;
 void save_set_options_for_QT(size_t level);
 
 
-void restore_options_for_QT(void);
+void restore_options_for_QT();
 
 
 #endif /* OPTIONS_FOR_QT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.cpp
index 57d4f0bd..0914d107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.cpp
@@ -22,6 +22,8 @@
 #include <regex>
 #include <set>
 
+// if you need more logs, commented out the next define line
+#define EXTRA_LOG
 
 constexpr static auto LCURRENT = LOUTPUT;
 
@@ -41,6 +43,44 @@ struct cmt_reflow
 };
 
 
+// for tracking line numbering
+bool numbering_status = false;
+int  line_number;
+char char_number[16] = { 0 };
+
+
+void set_numbering(bool status)
+{
+   if (options::set_numbering_for_html_output())
+   {
+      numbering_status = status;
+   }
+}
+
+
+bool get_numbering()
+{
+   return(numbering_status);
+}
+
+
+void set_line_number()
+{
+   line_number = 0;
+}
+
+
+void print_numbering()
+{
+   if (get_numbering())
+   {
+      line_number++;
+      sprintf(char_number, "%d ", line_number);
+      write_string(char_number);
+   }
+}
+
+
 /**
  * A multiline comment
  * The only trick here is that we have to trim out whitespace characters
@@ -253,7 +293,7 @@ static void add_char(UINT32 ch, bool is_literal)
    {
       write_string(cpd.newline);
       cpd.column      = 1;
-      cpd.did_newline = 1;
+      cpd.did_newline = true;
       cpd.spaces      = 0;
    }
 
@@ -263,14 +303,15 @@ static void add_char(UINT32 ch, bool is_literal)
       add_spaces();
       write_string(cpd.newline);
       cpd.column      = 1;
-      cpd.did_newline = 1;
+      cpd.did_newline = true;
       cpd.spaces      = 0;
+      print_numbering();
    }
    else if (ch == '\r') // do not output the CARRIAGERETURN
    {
       // do not output '\r'
       cpd.column      = 1;
-      cpd.did_newline = 1;
+      cpd.did_newline = true;
       cpd.spaces      = 0;
    }
    else if (  (ch == '\t')
@@ -293,7 +334,15 @@ static void add_char(UINT32 ch, bool is_literal)
       {
          log_rule_B("indent_with_tabs");
 
-         if (options::indent_with_tabs() == 0)
+         int indent_with_tabs = options::pp_indent_with_tabs();
+
+         if (  cpd.in_preproc != CT_PREPROC
+            || indent_with_tabs == -1)
+         {
+            indent_with_tabs = options::indent_with_tabs();
+         }
+
+         if (indent_with_tabs == 0)
          {
             size_t endcol = next_tab_column(cpd.column);
 
@@ -393,7 +442,7 @@ static bool next_word_exceeds_limit(const unc_text &text, size_t idx)
  */
 static void output_to_column(size_t column, bool allow_tabs)
 {
-   cpd.did_newline = 0;
+   cpd.did_newline = false;
 
    if (allow_tabs)
    {
@@ -418,7 +467,6 @@ static void output_to_column(size_t column, bool allow_tabs)
 static void cmt_output_indent(size_t brace_col, size_t base_col, size_t column)
 {
    log_rule_B("indent_cmt_with_tabs");
-   log_rule_B("indent_with_tabs");
    size_t iwt = options::indent_cmt_with_tabs() ? 2 :
                 (options::indent_with_tabs() ? 1 : 0);
 
@@ -427,7 +475,7 @@ static void cmt_output_indent(size_t brace_col, size_t base_col, size_t column)
    // LOG_FMT(LSYS, "%s(brace=%zd base=%zd col=%zd iwt=%zd) tab=%zd cur=%zd\n",
    //        __func__, brace_col, base_col, column, iwt, tab_col, cpd.column);
 
-   cpd.did_newline = 0;
+   cpd.did_newline = false;
 
    if (  iwt == 2
       || (  cpd.column == 1
@@ -468,40 +516,40 @@ void output_parsed(FILE *pfile, bool withOptions)
 #ifdef WIN32
    fprintf(pfile, "# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp     Nl  Text");
 #else // not WIN32
-   fprintf(pfile, "# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp         Flag   Nl  Text");
+   fprintf(pfile, "# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp             Flags   Nl  Text");
 #endif // ifdef WIN32
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
 #ifdef WIN32
       fprintf(pfile, "%s# %3d>%19.19s|%19.19s|%19.19s[%3d/%3d/%3d/%3d][%d/%d/%d][%d-%d]",
-              eol_marker, (int)pc->orig_line, get_token_name(pc->type),
-              get_token_name(get_chunk_parent_type(pc)), get_token_name(get_type_of_the_parent(pc)),
-              (int)pc->column, (int)pc->orig_col, (int)pc->orig_col_end, (int)pc->orig_prev_sp,
-              (int)pc->brace_level, (int)pc->level, (int)pc->pp_level, (int)pc->nl_count, pc->after_tab);
+              eol_marker, (int)pc->GetOrigLine(), get_token_name(pc->GetType()),
+              get_token_name(pc->GetParentType()), get_token_name(pc->GetTypeOfParent()),
+              (int)pc->GetColumn(), (int)pc->GetOrigCol(), (int)pc->GetOrigColEnd(), (int)pc->GetOrigPrevSp(),
+              (int)pc->GetBraceLevel(), (int)pc->GetLevel(), (int)pc->GetPpLevel(), (int)pc->GetNlCount(), pc->GetAfterTab());
 #else // not WIN32
-      fprintf(pfile, "%s# %3zu>%19.19s|%19.19s|%19.19s[%3zu/%3zu/%3zu/%3d][%zu/%zu/%zu]",
-              eol_marker, pc->orig_line, get_token_name(pc->type),
-              get_token_name(get_chunk_parent_type(pc)), get_token_name(get_type_of_the_parent(pc)),
-              pc->column, pc->orig_col, pc->orig_col_end, pc->orig_prev_sp,
-              pc->brace_level, pc->level, pc->pp_level);
+      fprintf(pfile, "%s# %3zu>%19.19s|%19.19s|%19.19s[%3zu/%3zu/%3zu/%3zu][%zu/%zu/%zu]",
+              eol_marker, pc->GetOrigLine(), get_token_name(pc->GetType()),
+              get_token_name(pc->GetParentType()), get_token_name(pc->GetTypeOfParent()),
+              pc->GetColumn(), pc->GetOrigCol(), pc->GetOrigColEnd(), pc->GetOrigPrevSp(),
+              pc->GetBraceLevel(), pc->GetLevel(), pc->GetPpLevel());
       // Print pc flags in groups of 4 hex characters
-      char flag_string[20];
-      sprintf(flag_string, "%12llx", static_cast<pcf_flags_t::int_t>(pc->flags));
-      fprintf(pfile, "[%.4s %.4s %.4s]", flag_string, flag_string + 4, flag_string + 8);
+      char flag_string[24];
+      sprintf(flag_string, "%16llx", static_cast<T_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->nl_count, pc->after_tab);
+              pc->GetNlCount(), pc->GetAfterTab());
 #endif // ifdef WIN32
 
-      if (  pc->type != CT_NEWLINE
+      if (  pc->IsNot(CT_NEWLINE)
          && (pc->Len() != 0))
       {
-         for (size_t cnt = 0; cnt < pc->column; cnt++)
+         for (size_t cnt = 0; cnt < pc->GetColumn(); cnt++)
          {
             fprintf(pfile, " ");
          }
 
-         if (pc->type != CT_NL_CONT)
+         if (pc->IsNot(CT_NL_CONT))
          {
             fprintf(pfile, "%s", pc->Text());
          }
@@ -510,6 +558,14 @@ void output_parsed(FILE *pfile, bool withOptions)
             fprintf(pfile, "\\");
          }
       }
+
+      if (options::debug_decode_the_flags())
+      {
+         // such as:
+         // The flags are: [0xc0400:IN_CLASS,STMT_START,EXPR_START]
+         fprintf(pfile, "%s         The flags are: ", eol_marker);
+         fprintf(pfile, "%s", pcf_flags_str(pc->GetFlags()).c_str());
+      }
    }
 
    fprintf(pfile, "%s# -=====-%s", eol_marker, eol_marker);
@@ -528,13 +584,13 @@ void output_parsed_csv(FILE *pfile)
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      fprintf(pfile, "%s%zu,%s,%s,%s,%zu,%zu,%zu,%d,%zu,%zu,%zu,",
-              eol_marker, pc->orig_line, get_token_name(pc->type),
-              get_token_name(get_chunk_parent_type(pc)), get_token_name(get_type_of_the_parent(pc)),
-              pc->column, pc->orig_col, pc->orig_col_end, pc->orig_prev_sp,
-              pc->brace_level, pc->level, pc->pp_level);
+      fprintf(pfile, "%s%zu,%s,%s,%s,%zu,%zu,%zu,%zu,%zu,%zu,%zu,",
+              eol_marker, pc->GetOrigLine(), get_token_name(pc->GetType()),
+              get_token_name(pc->GetParentType()), get_token_name(pc->GetTypeOfParent()),
+              pc->GetColumn(), pc->GetOrigCol(), pc->GetOrigColEnd(), pc->GetOrigPrevSp(),
+              pc->GetBraceLevel(), pc->GetLevel(), pc->GetPpLevel());
 
-      auto pcf_flag_str = pcf_flags_str(pcf_flag_e(pc->flags));
+      auto pcf_flag_str = pcf_flags_str(E_PcfFlag(pc->GetFlags()));
 #ifdef WIN32
       auto pcf_flag_str_start = pcf_flag_str.find("[") + 1;
 #else // not WIN32
@@ -545,19 +601,19 @@ void output_parsed_csv(FILE *pfile)
                                                   pcf_flag_str_end - pcf_flag_str_start);
       fprintf(pfile, "\"%s\",", pcf_names.c_str());
       fprintf(pfile, "%zu,%d,",
-              pc->nl_count, pc->after_tab);
+              pc->GetNlCount(), pc->GetAfterTab());
 
-      if (  pc->type != CT_NEWLINE
+      if (  pc->IsNot(CT_NEWLINE)
          && (pc->Len() != 0))
       {
          fprintf(pfile, "\"");
 
-         for (size_t cnt = 0; cnt < pc->column; cnt++)
+         for (size_t cnt = 0; cnt < pc->GetColumn(); cnt++)
          {
             fprintf(pfile, " ");
          }
 
-         if (pc->type != CT_NL_CONT)
+         if (pc->IsNot(CT_NL_CONT))
          {
             for (auto *ch = pc->Text(); *ch != '\0'; ++ch)
             {
@@ -582,12 +638,24 @@ void output_parsed_csv(FILE *pfile)
 } // output_parsed_csv
 
 
+// Compares two tracks according to second in descending order.
+bool compareTrack(Track_nr t1, Track_nr t2)
+{
+   char *t1s          = t1.second;
+   char *t2s          = t2.second;
+   int  vergleich     = strcmp(t2s, t1s);
+   bool int_vergleich = vergleich > 0;
+
+   return(int_vergleich);
+}
+
+
 void output_text(FILE *pfile)
 {
-   bool tracking = cpd.html_file != nullptr;                 // special for debugging
+   bool tracking = cpd.html_type != tracking_type_e::TT_NONE;                 // special for debugging
 
    cpd.fout        = pfile;
-   cpd.did_newline = 1;
+   cpd.did_newline = true;
    cpd.column      = 1;
 
    if (cpd.bom)
@@ -603,8 +671,8 @@ void output_text(FILE *pfile)
       // loop over the whole chunk list
       for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
-         pc->column        += indent;
-         pc->column_indent += indent;
+         pc->SetColumn(pc->GetColumn() + indent);
+         pc->SetColumnIndent(pc->GetColumnIndent() + indent);
       }
 
       cpd.frag_cols = 0;
@@ -612,6 +680,7 @@ void output_text(FILE *pfile)
 
    if (tracking)
    {
+      set_numbering(false);
       add_text("<html>\n");
       add_text("<head>\n");
       add_text("   <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/>\n");
@@ -621,40 +690,54 @@ void output_text(FILE *pfile)
       add_text("<p>\n");
       add_text("</p>\n");
       add_text("<pre>\n");
+      set_numbering(true);
+      set_line_number();
+      print_numbering();
+   }
+   bool write_in_tracking   = false;
+   int  pp_indent_with_tabs = options::pp_indent_with_tabs();
+
+   if (pp_indent_with_tabs == -1)
+   {
+      pp_indent_with_tabs = options::indent_with_tabs();
    }
-   bool write_in_tracking = false;
 
    // loop over the whole chunk list
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       char copy[1000];
-      LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s', type is %s, orig_line is %zu, column is %zu, nl is %zu\n",
-              __func__, __LINE__, pc->ElidedText(copy), get_token_name(pc->type), pc->orig_line, pc->column, pc->nl_count);
-      log_rule_B("cmt_convert_tab_to_spaces");
-      cpd.output_tab_as_space = (  options::cmt_convert_tab_to_spaces()
-                                && pc->IsComment());
+      LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s', type is %s, orig line is %zu, column is %zu, nl is %zu\n",
+              __func__, __LINE__, pc->ElidedText(copy), get_token_name(pc->GetType()), pc->GetOrigLine(), pc->GetColumn(), pc->GetNlCount());
+      cpd.output_tab_as_space = false;
 
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
-         for (size_t cnt = 0; cnt < pc->nl_count; cnt++)
+         for (size_t cnt = 0; cnt < pc->GetNlCount(); cnt++)
          {
             if (  cnt > 0
-               && pc->nl_column > 1)
+               && pc->GetNlColumn() > 1)
             {
-               log_rule_B("indent_with_tabs");
-               output_to_column(pc->nl_column, (options::indent_with_tabs() == 2));
+               log_rule_B("indent_with_tabs - newline");
+
+               if (pc->IsPreproc())
+               {
+                  output_to_column(pc->GetNlColumn(), (pp_indent_with_tabs == 2));
+               }
+               else
+               {
+                  output_to_column(pc->GetNlColumn(), (options::indent_with_tabs() == 2));
+               }
             }
             add_char('\n');
          }
 
-         cpd.did_newline = 1;
+         cpd.did_newline = true;
          cpd.column      = 1;
-         LOG_FMT(LOUTIND, " xx\n");
       }
-      else if (chunk_is_token(pc, CT_NL_CONT))
+      else if (pc->Is(CT_NL_CONT))
       {
          // FIXME: this really shouldn't be done here!
-         if (!pc->flags.test(PCF_WAS_ALIGNED))
+         if (!pc->TestFlags(PCF_WAS_ALIGNED))
          {
             // Add or remove space before a backslash-newline at the end of a line.
             log_rule_B("sp_before_nl_cont");
@@ -662,80 +745,89 @@ void output_text(FILE *pfile)
             if (options::sp_before_nl_cont() & IARF_REMOVE)
             {
                log_rule_B("sp_before_nl_cont");
-               pc->column = cpd.column + (options::sp_before_nl_cont() == IARF_FORCE);
+               pc->SetColumn(cpd.column + (options::sp_before_nl_cont() == IARF_FORCE));
             }
             else
             {
                // Try to keep the same relative spacing
                Chunk *prev = pc->GetPrev();
 
-               if (chunk_is_token(prev, CT_PP_IGNORE))
+               if (prev->Is(CT_PP_IGNORE))
                {
                   /*
                    * Want to completely leave alone PP_IGNORE'd blocks because
                    * they likely have special column aligned newline
                    * continuations (common in multiline macros)
                    */
-                  pc->column = pc->orig_col;
+                  pc->SetColumn(pc->GetOrigCol());
                }
                else
                {
                   // Try to keep the same relative spacing
                   while (  prev != nullptr
                         && prev->IsNotNullChunk()
-                        && prev->orig_col == 0
-                        && prev->nl_count == 0)
+                        && prev->GetOrigCol() == 0
+                        && prev->GetNlCount() == 0)
                   {
                      prev = prev->GetPrev();
                   }
 
                   if (  prev != nullptr
                      && prev->IsNotNullChunk()
-                     && prev->nl_count == 0)
+                     && prev->GetNlCount() == 0)
                   {
-                     int orig_sp = (pc->orig_col - prev->orig_col_end);
+                     int orig_sp = pc->GetOrigPrevSp();
 
                      if ((int)(cpd.column + orig_sp) < 0)
                      {
 #ifdef WIN32
-                        fprintf(stderr, "FATAL: negative value.\n   pc->orig_col is %d, prev->orig_col_end is %d\n",
-                                (int)pc->orig_col, (int)prev->orig_col_end);
+                        fprintf(stderr, "FATAL: negative value.\n   pc->GetOrigCol() is %d, prev->GetOrigColEnd() is %d\n",
+                                (int)pc->GetOrigCol(), (int)prev->GetOrigColEnd());
 #else // not WIN32
-                        fprintf(stderr, "FATAL: negative value.\n   pc->orig_col is %zu, prev->orig_col_end is %zu\n",
-                                pc->orig_col, prev->orig_col_end);
+                        fprintf(stderr, "FATAL: negative value.\n   pc->GetOrigCol() is %zu, prev->GetOrigColEnd() is %zu\n",
+                                pc->GetOrigCol(), prev->GetOrigColEnd());
 #endif // ifdef WIN32
                         log_flush(true);
                         exit(EX_SOFTWARE);
                      }
-                     pc->column = cpd.column + orig_sp;
+                     pc->SetColumn(cpd.column + orig_sp);
 
                      // Add or remove space before a backslash-newline at the end of a line.
                      log_rule_B("sp_before_nl_cont");
 
                      if (  (options::sp_before_nl_cont() != IARF_IGNORE)
-                        && (pc->column < (cpd.column + 1)))
+                        && (pc->GetColumn() < (cpd.column + 1)))
                      {
-                        pc->column = cpd.column + 1;
+                        pc->SetColumn(cpd.column + 1);
                      }
                   }
                }
             }
-            output_to_column(pc->column, false);
+            output_to_column(pc->GetColumn(), false);
          }
          else
          {
-            log_rule_B("indent_with_tabs");
-            output_to_column(pc->column, (options::indent_with_tabs() == 2));
+            log_rule_B("indent_with_tabs - newline cont");
+
+            if (pc->IsPreproc())
+            {
+               output_to_column(pc->GetColumn(), (pp_indent_with_tabs == 2));
+            }
+            else
+            {
+               output_to_column(pc->GetColumn(), (options::indent_with_tabs() == 2));
+            }
          }
          add_char('\\');
          add_char('\n');
-         cpd.did_newline = 1;
+         cpd.did_newline = true;
          cpd.column      = 1;
-         LOG_FMT(LOUTIND, " \\xx\n");
       }
-      else if (chunk_is_token(pc, CT_COMMENT_MULTI))
+      else if (pc->Is(CT_COMMENT_MULTI))
       {
          log_rule_B("cmt_indent_multi");
+         log_rule_B("cmt_convert_tab_to_spaces - multi");
+         cpd.output_tab_as_space = options::cmt_convert_tab_to_spaces();
 
          if (options::cmt_indent_multi())
          {
@@ -746,8 +838,12 @@ void output_text(FILE *pfile)
             output_comment_multi_simple(pc);
          }
       }
-      else if (chunk_is_token(pc, CT_COMMENT_CPP))
+      else if (pc->Is(CT_COMMENT_CPP))
       {
+         log_rule_B("cmt_comment_cpp");
+         log_rule_B("cmt_convert_tab_to_spaces - comment_cpp");
+         cpd.output_tab_as_space = options::cmt_convert_tab_to_spaces();
+
          bool tmp = cpd.output_trailspace;
          /*
           * keep trailing spaces if they are still present in a chunk;
@@ -758,70 +854,79 @@ void output_text(FILE *pfile)
          pc                    = output_comment_cpp(pc);
          cpd.output_trailspace = tmp;
       }
-      else if (chunk_is_token(pc, CT_COMMENT))
+      else if (pc->Is(CT_COMMENT))
       {
+         log_rule_B("cmt_comment");
+         log_rule_B("cmt_convert_tab_to_spaces - comment");
+         cpd.output_tab_as_space = options::cmt_convert_tab_to_spaces();
+
          pc = output_comment_c(pc);
       }
-      else if (  chunk_is_token(pc, CT_JUNK)
-              || chunk_is_token(pc, CT_IGNORED))
+      else if (  pc->Is(CT_JUNK)
+              || pc->Is(CT_IGNORED))
       {
-         LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, orig_col is %zu,\npc->Text() >%s<, pc->str.size() is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), pc->str.size());
+         LOG_FMT(LOUTIND, "%s(%d): orig line is %zu, orig col is %zu,\npc->Text() >%s<, pc->str.size() is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), pc->GetStr().size());
          // do not adjust the column for junk
-         add_text(pc->str, true);
+         add_text(pc->GetStr(), true);
       }
       else if (pc->Len() == 0)
       {
          // don't do anything for non-visible stuff
-         LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, column is %zu, non-visible stuff: type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->column, get_token_name(pc->type));
+         LOG_FMT(LOUTIND, "%s(%d): orig line is %zu, column is %zu, non-visible stuff: type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetColumn(), get_token_name(pc->GetType()));
       }
       else
       {
          bool allow_tabs;
-         cpd.output_trailspace = (chunk_is_token(pc, CT_STRING_MULTI));
+         cpd.output_trailspace = (pc->Is(CT_STRING_MULTI));
 
          // indent to the 'level' first
          if (cpd.did_newline)
          {
-            log_rule_B("indent_with_tabs");
-
-            if (options::indent_with_tabs() == 1)
+            if (  (  pc->IsPreproc()
+                  && pp_indent_with_tabs == 1)
+               || (  !pc->IsPreproc()
+                  && options::indent_with_tabs() == 1))
             {
                size_t lvlcol;
 
                /*
-                * FIXME: it would be better to properly set column_indent in
+                * FIXME: it would be better to properly set m_columnIndent in
                 * indent_text(), but this hack for '}' and '#' seems to work.
                 */
-               if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                  || chunk_is_token(pc, CT_CASE_COLON)
-                  || chunk_is_token(pc, CT_PREPROC))
+               if (  pc->Is(CT_BRACE_CLOSE)
+                  || pc->Is(CT_CASE_COLON)
+                  || pc->IsPreproc())
                {
-                  lvlcol = pc->column;
+                  lvlcol = pc->GetColumn();
                }
                else
                {
-                  lvlcol = pc->column_indent;
+                  lvlcol = pc->GetColumnIndent();
 
-                  if (lvlcol > pc->column)
+                  if (lvlcol > pc->GetColumn())
                   {
-                     lvlcol = pc->column;
+                     lvlcol = pc->GetColumn();
                   }
                }
 
                if (lvlcol > 1)
                {
+                  log_rule_B("indent_with_tabs - hack");
                   output_to_column(lvlcol, true);
                }
             }
             log_rule_B("indent_with_tabs");
-            allow_tabs = (options::indent_with_tabs() == 2)
+            allow_tabs = (  pc->IsPreproc()
+                         && pp_indent_with_tabs == 2)
+                         || (  !pc->IsPreproc()
+                            && options::indent_with_tabs() == 2)
                          || (  pc->IsComment()
                             && options::indent_with_tabs() != 0);
 
-            LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, column is %zu, column_indent is %zu, cpd.column is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->column, pc->column_indent, cpd.column);
+            LOG_FMT(LOUTIND, "%s(%d): orig line is %zu, column is %zu, column indent is %zu, cpd.column is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetColumn(), pc->GetColumnIndent(), cpd.column);
          }
          else
          {
@@ -831,7 +936,7 @@ void output_text(FILE *pfile)
              * This has to be done here because comments are not formatted
              * until the output phase.
              */
-            if (pc->column < cpd.column)
+            if (pc->GetColumn() < cpd.column)
             {
                reindent_line(pc, cpd.column);
             }
@@ -839,42 +944,58 @@ void output_text(FILE *pfile)
             Chunk *prev = pc->GetPrev();
             log_rule_B("align_with_tabs");
             allow_tabs = (  options::align_with_tabs()
-                         && pc->flags.test(PCF_WAS_ALIGNED)
-                         && ((prev->column + prev->Len() + 1) != pc->column));
+                         && pc->TestFlags(PCF_WAS_ALIGNED)
+                         && ((prev->GetColumn() + prev->Len() + 1) != pc->GetColumn()));
 
             log_rule_B("align_keep_tabs");
 
             if (options::align_keep_tabs())
             {
-               allow_tabs |= pc->after_tab;
+               allow_tabs |= pc->GetAfterTab();
             }
             LOG_FMT(LOUTIND, "%s(%d): at column %zu(%s)\n",
-                    __func__, __LINE__, pc->column, (allow_tabs ? "true" : "FALSE"));
+                    __func__, __LINE__, pc->GetColumn(), (allow_tabs ? "true" : "FALSE"));
          }
-         output_to_column(pc->column, allow_tabs);
+         output_to_column(pc->GetColumn(), allow_tabs);
 
          if (write_in_tracking)
          {
-            if (chunk_is_token(pc, CT_ANGLE_OPEN))
+            if (pc->Is(CT_ANGLE_OPEN))
             {
                add_text("&lt;", false, false);
             }
-            else if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+            else if (pc->Is(CT_ANGLE_CLOSE))
             {
                add_text("&gt;", false, false);
             }
             else
             {
-               add_text(pc->str, false, chunk_is_token(pc, CT_STRING));
+               if (tracking)
+               {
+                  if (pc->GetStr()[0] == '<')
+                  {
+                     add_text("&lt;", false, false);
+                     size_t lang = pc->GetStr().size();
+
+                     for (size_t idx = 1; idx < lang - 1; idx++)
+                     {
+                        int ch = pc->GetStr()[idx];
+                        add_char(ch);
+                     }
+
+                     add_text("&gt;", false, false);
+                  }
+               }
+               add_text(pc->GetStr(), false, pc->Is(CT_STRING));
             }
             write_in_tracking = false;
          }
          else
          {
-            add_text(pc->str, false, chunk_is_token(pc, CT_STRING));
+            add_text(pc->GetStr(), false, pc->Is(CT_STRING));
          }
 
-         if (chunk_is_token(pc, CT_PP_DEFINE))  // Issue #876
+         if (pc->Is(CT_PP_DEFINE))  // Issue #876
          {
             // If true, a <TAB> is inserted after #define.
             log_rule_B("force_tab_after_define");
@@ -884,44 +1005,99 @@ void output_text(FILE *pfile)
                add_char('\t');
             }
          }
-         cpd.did_newline       = chunk_is_newline(pc);
+         cpd.did_newline       = pc->IsNewline();
          cpd.output_trailspace = false;
       }
 
-      if (pc->tracking != nullptr)
+      if (pc->GetTrackingData() != nullptr)
       {
          LOG_FMT(LGUY, " Tracking info are: \n");
-         LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->tracking->size());
+         LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->GetTrackingData()->size());
          add_text("<a title=\"");
          char tempText[80];
 
-         for (size_t track = 0; track < pc->tracking->size(); track++)
+         // is sorting necessary?
+         size_t many = pc->GetTrackingData()->size();
+
+         if (many > 1)
          {
-            track_list *A       = pc->tracking;
-            Track_nr   B        = A->at(track);
-            size_t     Bfirst   = B.first;
-            char       *Bsecond = B.second;
+#ifdef EXTRA_LOG
+            // 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;
 
-            sprintf(tempText, "%zu", Bfirst);
-            add_text(tempText);
-            add_text(",");
+               LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
+               LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
+            }
+#endif
 
-            if (track == pc->tracking->size() - 1)
+            if (options::debug_sort_the_tracks())
+            {
+               track_list *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++)
             {
-               sprintf(tempText, "%s", Bsecond);
-               add_text(tempText);
+               const track_list *A       = pc->GetTrackingData();
+               const Track_nr   B        = A->at(track);
+               size_t           Bfirst   = B.first;
+               char             *Bsecond = B.second;
+
+               LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
+               LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
             }
-            LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
-            LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
+#endif
          }
+         char *old_one = nullptr;
+
+         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;
+
+            if (  old_one == nullptr
+               || strcmp(old_one, Bsecond) != 0)
+            {
+               // first time this option
+               if (old_one != nullptr)
+               {
+                  add_text("&#010;");
+               }
+               old_one = Bsecond;
+
+               if (first_text)
+               {
+                  sprintf(tempText, "%s", Bsecond);
+                  add_text(tempText);
+                  add_text(": ");
+                  first_text = false;
+               }
+            }
+            else
+            {
+               add_text(", ");
+            }
+            sprintf(tempText, "%zu", Bfirst);
+            add_text(tempText);
+         } // for (size_t track = 0; track < pc->GetTrackingData()->size(); track++)
 
          add_text("\"><font color=\"red\">M</font></a>");
          write_in_tracking = true;
-      }
-   }
+      } // if (pc->GetTrackingData() != nullptr)
+   } // loop over the whole chunk list
 
    if (tracking)
    {
+      set_numbering(false);
       add_text("</pre>\n");
       add_text("</body>\n");
       add_text("</html>\n");
@@ -1388,11 +1564,11 @@ static Chunk *get_next_function(Chunk *pc)
 
    while ((pc = pc->GetNext())->IsNotNullChunk())
    {
-      if (  chunk_is_token(pc, CT_FUNC_DEF)
-         || chunk_is_token(pc, CT_FUNC_PROTO)
-         || chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-         || chunk_is_token(pc, CT_FUNC_CLASS_PROTO)
-         || chunk_is_token(pc, CT_OC_MSG_DECL))
+      if (  pc->Is(CT_FUNC_DEF)
+         || pc->Is(CT_FUNC_PROTO)
+         || pc->Is(CT_FUNC_CLASS_DEF)
+         || pc->Is(CT_FUNC_CLASS_PROTO)
+         || pc->Is(CT_OC_MSG_DECL))
       {
          return(pc);
       }
@@ -1403,25 +1579,25 @@ static Chunk *get_next_function(Chunk *pc)
 
 static Chunk *get_next_class(Chunk *pc)
 {
-   return(chunk_search_next_cat(pc, CT_CLASS)->GetNext());
+   return(pc->GetNextType(CT_CLASS)->GetNext());
 }
 
 
 static Chunk *get_prev_category(Chunk *pc)
 {
-   return(chunk_search_prev_cat(pc, CT_OC_CATEGORY));
+   return(pc->GetPrevType(CT_OC_CATEGORY));
 }
 
 
 static Chunk *get_next_scope(Chunk *pc)
 {
-   return(chunk_search_next_cat(pc, CT_OC_SCOPE));
+   return(pc->GetNextType(CT_OC_SCOPE));
 }
 
 
 static Chunk *get_prev_oc_class(Chunk *pc)
 {
-   return(chunk_search_prev_cat(pc, CT_OC_CLASS));
+   return(pc->GetPrevType(CT_OC_CLASS));
 }
 
 
@@ -1602,9 +1778,9 @@ static void add_comment_text(const unc_text &text,
 static void output_cmt_start(cmt_reflow &cmt, Chunk *pc)
 {
    cmt.pc          = pc;
-   cmt.column      = pc->column;
-   cmt.brace_col   = pc->column_indent;
-   cmt.base_col    = pc->column_indent;
+   cmt.column      = pc->GetColumn();
+   cmt.brace_col   = pc->GetColumnIndent();
+   cmt.base_col    = pc->GetColumnIndent();
    cmt.word_count  = 0;
    cmt.xtra_indent = 0;
    cmt.cont_text.clear();
@@ -1634,20 +1810,20 @@ static void output_cmt_start(cmt_reflow &cmt, Chunk *pc)
    if (cmt.brace_col == 0)
    {
       log_rule_B("output_tab_size");
-      cmt.brace_col = 1 + (pc->brace_level * options::output_tab_size());
+      cmt.brace_col = 1 + (pc->GetBraceLevel() * options::output_tab_size());
    }
    // LOG_FMT(LSYS, "%s: line %zd, brace=%zd base=%zd col=%zd orig=%zd aligned=%x\n",
-   //        __func__, pc->orig_line, cmt.brace_col, cmt.base_col, cmt.column, pc->orig_col,
-   //        pc->flags & (PCF_WAS_ALIGNED | PCF_RIGHT_COMMENT));
+   //        __func__, pc->GetOrigLine(), cmt.brace_col, cmt.base_col, cmt.column, pc->GetOrigCol(),
+   //        pc->GetFlags() & (PCF_WAS_ALIGNED | PCF_RIGHT_COMMENT));
 
-   if (  get_chunk_parent_type(pc) == CT_COMMENT_START
-      || get_chunk_parent_type(pc) == CT_COMMENT_WHOLE)
+   if (  pc->GetParentType() == CT_COMMENT_START
+      || pc->GetParentType() == CT_COMMENT_WHOLE)
    {
       log_rule_B("indent_col1_comment");
 
       if (  !options::indent_col1_comment()
-         && pc->orig_col == 1
-         && !pc->flags.test(PCF_INSERTED))
+         && pc->GetOrigCol() == 1
+         && !pc->TestFlags(PCF_INSERTED))
       {
          cmt.column    = 1;
          cmt.base_col  = 1;
@@ -1658,13 +1834,13 @@ static void output_cmt_start(cmt_reflow &cmt, Chunk *pc)
    log_rule_B("indent_cmt_with_tabs");
 
    if (  options::indent_cmt_with_tabs()
-      && (  get_chunk_parent_type(pc) == CT_COMMENT_END
-         || get_chunk_parent_type(pc) == CT_COMMENT_WHOLE))
+      && (  pc->GetParentType() == CT_COMMENT_END
+         || pc->GetParentType() == CT_COMMENT_WHOLE))
    {
       cmt.column = align_tab_column(cmt.column - 1);
       // LOG_FMT(LSYS, "%s: line %d, orig:%d new:%d\n",
-      //        __func__, pc->orig_line, pc->column, cmt.column);
-      pc->column = cmt.column;
+      //        __func__, pc->GetOrigLine(), pc->GetColumn(), cmt.column);
+      pc->SetColumn(cmt.column);
    }
    cmt.base_col = cmt.column;
 
@@ -1679,7 +1855,7 @@ static void output_cmt_start(cmt_reflow &cmt, Chunk *pc)
 static bool can_combine_comment(Chunk *pc, cmt_reflow &cmt)
 {
    // We can't combine if there is something other than a newline next
-   if (get_chunk_parent_type(pc) == CT_COMMENT_START)
+   if (pc->GetParentType() == CT_COMMENT_START)
    {
       return(false);
    }
@@ -1692,18 +1868,18 @@ static bool can_combine_comment(Chunk *pc, cmt_reflow &cmt)
    Chunk *next = pc->GetNext();
 
    if (  next->IsNotNullChunk()
-      && next->nl_count == 1)
+      && next->GetNlCount() == 1)
    {
       // Make sure the comment is the same type at the same column
       next = next->GetNext();
 
-      if (  chunk_is_token(next, pc->type)
-         && (  (  next->column == 1
-               && pc->column == 1)
-            || (  next->column == cmt.base_col
-               && pc->column == cmt.base_col)
-            || (  next->column > cmt.base_col
-               && get_chunk_parent_type(pc) == CT_COMMENT_END)))
+      if (  next->Is(pc->GetType())
+         && (  (  next->GetColumn() == 1
+               && pc->GetColumn() == 1)
+            || (  next->GetColumn() == cmt.base_col
+               && pc->GetColumn() == cmt.base_col)
+            || (  next->GetColumn() > cmt.base_col
+               && pc->GetParentType() == CT_COMMENT_END)))
       {
          return(true);
       }
@@ -1733,18 +1909,18 @@ static Chunk *output_comment_c(Chunk *first)
 
       log_rule_B("cmt_trailing_single_line_c_to_cpp");
 
-      if (options::cmt_trailing_single_line_c_to_cpp() && chunk_is_last_on_line(first))
+      if (options::cmt_trailing_single_line_c_to_cpp() && first->IsLastChunkOnLine())
       {
          add_text("//");
 
          unc_text tmp;
-         tmp.set(first->str, 2, first->Len() - 4);
+         tmp.set(first->GetStr(), 2, first->Len() - 4);
          cmt_trim_whitespace(tmp, false);
          add_comment_text(tmp, cmt, false);
       }
       else
       {
-         add_comment_text(first->str, cmt, false);
+         add_comment_text(first->GetStr(), cmt, false);
       }
       return(first);
    }
@@ -1767,11 +1943,10 @@ static Chunk *output_comment_c(Chunk *first)
    {
       LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s'\n",
               __func__, __LINE__, pc->Text());
-      tmp.set(pc->str, 2, pc->Len() - 4);
+      tmp.set(pc->GetStr(), 2, pc->Len() - 4);
 
       if (  cpd.last_char == '*'
-         && (  tmp[0] == '/'
-            || tmp[0] != ' '))                 // Issue #1908
+         && tmp[0] != ' ')                 // Issue #1908
       {
          LOG_FMT(LCONTTEXT, "%s(%d): add_text a " "\n", __func__, __LINE__);
          add_text(" ");
@@ -1788,7 +1963,7 @@ static Chunk *output_comment_c(Chunk *first)
       pc = pc->GetNext();
       pc = pc->GetNext();
    }
-   tmp.set(pc->str, 2, pc->Len() - 4);
+   tmp.set(pc->GetStr(), 2, pc->Len() - 4);
 
    if (  cpd.last_char == '*'
       && tmp[0] == '/')
@@ -1863,7 +2038,7 @@ static Chunk *output_comment_cpp(Chunk *first)
 
    if (options::sp_cmt_cpp_qttr())
    {
-      const int c = first->str[2];
+      const int c = first->GetStr()[2];
 
       if (  c == ':'
          || c == '='
@@ -1877,7 +2052,7 @@ static Chunk *output_comment_cpp(Chunk *first)
 
    if (!options::cmt_cpp_to_c())
    {
-      auto const *cmt_text = first->str.c_str() + 2;
+      auto const *cmt_text = first->GetStr().c_str() + 2;
       // Add or remove space after the opening of a C++ comment,
       // i.e. '// A' vs. '//A'.
       auto *sp_cmt = &options::sp_cmt_cpp_start;
@@ -1892,8 +2067,8 @@ static Chunk *output_comment_cpp(Chunk *first)
       }
 
       // Determine if we are dealing with a region marker
-      if (  (  !first->prev
-            || first->prev->orig_line != first->orig_line)
+      if (  (  first->GetPrev()->IsNullChunk()
+            || first->GetPrev()->GetOrigLine() != first->GetOrigLine())
          && (  strncmp(cmt_text, "BEGIN", 5) == 0
             || strncmp(cmt_text, "END", 3) == 0))
       {
@@ -1920,15 +2095,15 @@ static Chunk *output_comment_cpp(Chunk *first)
 
       if ((*sp_cmt)() == IARF_IGNORE)
       {
-         add_comment_text(first->str, cmt, false);
+         add_comment_text(first->GetStr(), cmt, false);
       }
       else
       {
          size_t   iLISz = leadin.size();
-         unc_text tmp(first->str, 0, iLISz);
+         unc_text tmp(first->GetStr(), 0, iLISz);
          add_comment_text(tmp, cmt, false);
 
-         tmp.set(first->str, iLISz, first->Len() - iLISz);
+         tmp.set(first->GetStr(), iLISz, first->Len() - iLISz);
 
          // Add or remove space after the opening of a C++ comment,
          // i.e. '// A' vs. '//A'.
@@ -1983,12 +2158,12 @@ static Chunk *output_comment_cpp(Chunk *first)
       // i.e. '// A' vs. '//A'.
       log_rule_B("sp_cmt_cpp_start");
 
-      if (  !unc_isspace(first->str[2])
+      if (  !unc_isspace(first->GetStr()[2])
          && (options::sp_cmt_cpp_start() & IARF_ADD))
       {
          add_char(' ');
       }
-      tmp.set(first->str, 2, first->Len() - 2);
+      tmp.set(first->GetStr(), 2, first->Len() - 2);
       add_comment_text(tmp, cmt, true);
       add_text(" */");
       return(first);
@@ -2010,8 +2185,8 @@ static Chunk *output_comment_cpp(Chunk *first)
 
    while (can_combine_comment(pc, cmt))
    {
-      offs = unc_isspace(pc->str[2]) ? 1 : 0;
-      tmp.set(pc->str, 2 + offs, pc->Len() - (2 + offs));
+      offs = unc_isspace(pc->GetStr()[2]) ? 1 : 0;
+      tmp.set(pc->GetStr(), 2 + offs, pc->Len() - (2 + offs));
 
       if (  cpd.last_char == '*'
          && tmp[0] == '/')
@@ -2022,8 +2197,8 @@ static Chunk *output_comment_cpp(Chunk *first)
       add_comment_text("\n", cmt, false);
       pc = pc->GetNext()->GetNext();
    }
-   offs = unc_isspace(pc->str[2]) ? 1 : 0;
-   tmp.set(pc->str, 2 + offs, pc->Len() - (2 + offs));
+   offs = unc_isspace(pc->GetStr()[2]) ? 1 : 0;
+   tmp.set(pc->GetStr(), 2 + offs, pc->Len() - (2 + offs));
    add_comment_text(tmp, cmt, true);
 
    log_rule_B("cmt_cpp_nl_end");
@@ -2119,8 +2294,8 @@ static std::map<std::size_t, std::pair<std::wregex, std::wregex> > get_reflow_fo
       }
       else
       {
-         regex_map.emplace(0L, std::make_pair(L"[\\w,\\]\\)]$", L"^[\\w,\\[\\(]"));
-         regex_map.emplace(1L, std::make_pair(L"\\.$", L"^[A-Z]"));
+         regex_map.emplace(0L, std::make_pair((std::wregex)L"[\\w,\\]\\)]$", (std::wregex)L"^[\\w,\\[\\(]"));
+         regex_map.emplace(1L, std::make_pair((std::wregex)L"\\.$", (std::wregex)L"^[A-Z]"));
       }
    }
    return(regex_map);
@@ -2137,17 +2312,17 @@ static void output_comment_multi(Chunk *pc)
 
    char       copy[1000];
 
-   LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s', type is %s, orig_col is %zu, column is %zu\n",
-           __func__, __LINE__, pc->ElidedText(copy), get_token_name(pc->type), pc->orig_col, pc->column);
+   LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s', type is %s, orig col is %zu, column is %zu\n",
+           __func__, __LINE__, pc->ElidedText(copy), get_token_name(pc->GetType()), pc->GetOrigCol(), pc->GetColumn());
 
    output_cmt_start(cmt, pc);
    log_rule_B("cmt_reflow_mode");
    cmt.reflow = (options::cmt_reflow_mode() != 1);
 
    size_t cmt_col  = cmt.base_col;
-   int    col_diff = pc->orig_col - cmt.base_col;
+   int    col_diff = pc->GetOrigCol() - cmt.base_col;
 
-   calculate_comment_body_indent(cmt, pc->str);
+   calculate_comment_body_indent(cmt, pc->GetStr());
 
    log_rule_B("cmt_indent_multi");
    log_rule_B("cmt_star_cont");
@@ -2155,8 +2330,8 @@ static void output_comment_multi(Chunk *pc)
                    (options::cmt_star_cont() ? "* " : "  ");
    LOG_CONTTEXT();
 
-   std::wstring pc_wstring(pc->str.get().cbegin(),
-                           pc->str.get().cend());
+   std::wstring pc_wstring(pc->GetStr().get().cbegin(),
+                           pc->GetStr().get().cend());
 
    size_t doxygen_javadoc_param_name_indent    = 0;
    size_t doxygen_javadoc_continuation_indent  = 0;
@@ -2167,7 +2342,7 @@ static void output_comment_multi(Chunk *pc)
                                               doxygen_javadoc_continuation_indent);
 
    size_t   line_count                   = 0;
-   size_t   ccol                         = pc->column; // the col of subsequent comment lines
+   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;
@@ -2189,19 +2364,19 @@ static void output_comment_multi(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->str);
-   auto enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->str);
+   auto disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->GetStr());
+   auto enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->GetStr());
 
    while (cmt_idx < pc->Len())
    {
-      int ch = pc->str[cmt_idx];
+      int ch = pc->GetStr()[cmt_idx];
       cmt_idx++;
 
       if (  cmt_idx > std::size_t(disable_processing_cmt_idx)
          && enable_processing_cmt_idx > disable_processing_cmt_idx)
       {
          auto     length = enable_processing_cmt_idx - disable_processing_cmt_idx;
-         unc_text verbatim_text(pc->str,
+         unc_text verbatim_text(pc->GetStr(),
                                 disable_processing_cmt_idx,
                                 length);
 
@@ -2213,9 +2388,9 @@ static void output_comment_multi(Chunk *pc)
           * check for additional enable/disable processing comment strings that may
           * both be embedded within the same multi-line comment
           */
-         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str,
+         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->GetStr(),
                                                                              enable_processing_cmt_idx);
-         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->str,
+         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->GetStr(),
                                                                            enable_processing_cmt_idx);
 
          /**
@@ -2231,7 +2406,7 @@ static void output_comment_multi(Chunk *pc)
          ch = '\n';
 
          if (  cmt_idx < pc->Len()
-            && pc->str[cmt_idx] == '\n')
+            && pc->GetStr()[cmt_idx] == '\n')
          {
             cmt_idx++;
          }
@@ -2269,8 +2444,8 @@ static void output_comment_multi(Chunk *pc)
          {
             doxygen_javadoc_indent_align = true;
 
-            std::string match(pc->str.get().cbegin() + start_idx,
-                              pc->str.get().cbegin() + end_idx);
+            std::string match(pc->GetStr().get().cbegin() + start_idx,
+                              pc->GetStr().get().cbegin() + end_idx);
 
             match.erase(std::remove_if(match.begin(),
                                        match.end(),
@@ -2316,14 +2491,14 @@ static void output_comment_multi(Chunk *pc)
 
                while (true)
                {
-                  cmt_idx = eat_line_whitespace(pc->str,
+                  cmt_idx = eat_line_whitespace(pc->GetStr(),
                                                 cmt_idx);
 
                   while (  cmt_idx < pc->Len()
-                        && !unc_isspace(pc->str[cmt_idx])
-                        && pc->str[cmt_idx] != ',')
+                        && !unc_isspace(pc->GetStr()[cmt_idx])
+                        && pc->GetStr()[cmt_idx] != ',')
                   {
-                     line.append(pc->str[cmt_idx++]);
+                     line.append(pc->Str()[cmt_idx++]);
                   }
 
                   if (!is_param_tag)
@@ -2333,10 +2508,10 @@ static void output_comment_multi(Chunk *pc)
                   /**
                    * check for the possibility that comma-separated parameter names are present
                    */
-                  cmt_idx = eat_line_whitespace(pc->str,
+                  cmt_idx = eat_line_whitespace(pc->GetStr(),
                                                 cmt_idx);
 
-                  if (pc->str[cmt_idx] != ',')
+                  if (pc->GetStr()[cmt_idx] != ',')
                   {
                      break;
                   }
@@ -2344,7 +2519,7 @@ static void output_comment_multi(Chunk *pc)
                   line.append(", ");
                }
             }
-            cmt_idx = eat_line_whitespace(pc->str,
+            cmt_idx = eat_line_whitespace(pc->GetStr(),
                                           cmt_idx);
             indent = int(doxygen_javadoc_continuation_indent) - int(line.size());
 
@@ -2354,9 +2529,9 @@ static void output_comment_multi(Chunk *pc)
             }
 
             while (  cmt_idx < pc->Len()
-                  && !unc_isspace(pc->str[cmt_idx]))
+                  && !unc_isspace(pc->GetStr()[cmt_idx]))
             {
-               line.append(pc->str[cmt_idx++]);
+               line.append(pc->Str()[cmt_idx++]);
             }
             continue;
          }
@@ -2383,7 +2558,7 @@ static void output_comment_multi(Chunk *pc)
             if (  prev_nonempty_line < 0
                && !unc_isspace(line[nwidx])
                && line[nwidx] != '*'    // block comment: skip '*' at end of line
-               && (pc->flags.test(PCF_IN_PREPROC)
+               && (pc->TestFlags(PCF_IN_PREPROC)
                    ? (  line[nwidx] != '\\'
                      || (  line[nwidx + 1] != '\r'
                         && line[nwidx + 1] != '\n'))
@@ -2395,17 +2570,17 @@ static void output_comment_multi(Chunk *pc)
 
          for (size_t nxt_idx = cmt_idx;
               (  nxt_idx < pc->Len()
-              && pc->str[nxt_idx] != '\r'
-              && pc->str[nxt_idx] != '\n');
+              && pc->GetStr()[nxt_idx] != '\r'
+              && pc->GetStr()[nxt_idx] != '\n');
               nxt_idx++)
          {
             if (  next_nonempty_line < 0
-               && !unc_isspace(pc->str[nxt_idx])
-               && pc->str[nxt_idx] != '*'
-               && (pc->flags.test(PCF_IN_PREPROC)
-                   ? (  pc->str[nxt_idx] != '\\'
-                     || (  pc->str[nxt_idx + 1] != '\r'
-                        && pc->str[nxt_idx + 1] != '\n'))
+               && !unc_isspace(pc->GetStr()[nxt_idx])
+               && pc->GetStr()[nxt_idx] != '*'
+               && (pc->TestFlags(PCF_IN_PREPROC)
+                   ? (  pc->GetStr()[nxt_idx] != '\\'
+                     || (  pc->GetStr()[nxt_idx + 1] != '\r'
+                        && pc->GetStr()[nxt_idx + 1] != '\n'))
                    : true))
             {
                next_nonempty_line = nxt_idx;  // first non-whitespace char in the next line
@@ -2422,7 +2597,7 @@ static void output_comment_multi(Chunk *pc)
             int cmt_star_indent = 0;
 
             while (  next_nonempty_line > cmt_star_indent
-                  && pc->str[next_nonempty_line - cmt_star_indent - 1] != '*')
+                  && pc->GetStr()[next_nonempty_line - cmt_star_indent - 1] != '*')
             {
                ++cmt_star_indent;
             }
@@ -2464,8 +2639,8 @@ static void output_comment_multi(Chunk *pc)
          {
             std::wstring prev_line(line.get().cbegin(),
                                    line.get().cend());
-            std::wstring next_line(pc->str.get().cbegin() + next_nonempty_line,
-                                   pc->str.get().cend());
+            std::wstring next_line(pc->GetStr().get().cbegin() + next_nonempty_line,
+                                   pc->GetStr().get().cend());
 
             for (auto &&cmt_reflow_regex_map_entry : cmt_reflow_regex_map)
             {
@@ -2523,7 +2698,7 @@ static void output_comment_multi(Chunk *pc)
          {
             nl_end = true;
             line.pop_back();
-            cmt_trim_whitespace(line, pc->flags.test(PCF_IN_PREPROC));
+            cmt_trim_whitespace(line, pc->TestFlags(PCF_IN_PREPROC));
          }
 
          if (line_count == 1)
@@ -2698,13 +2873,14 @@ static bool kw_fcn_filename(Chunk *cmt, unc_text &out_txt)
 
 static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt)
 {
-   Chunk *tmp = nullptr;
+   Chunk *tmp = Chunk::NullChunkPtr;
 
    if (language_is_set(LANG_CPP | LANG_OC))
    {
       Chunk *fcn = get_next_function(cmt);
 
-      if (chunk_is_token(fcn, CT_OC_MSG_DECL))
+      if (  fcn != nullptr
+         && fcn->Is(CT_OC_MSG_DECL))
       {
          tmp = get_prev_oc_class(cmt);
       }
@@ -2718,18 +2894,18 @@ static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt)
       tmp = get_prev_oc_class(cmt);
    }
 
-   if (tmp == nullptr)
+   if (tmp->IsNullChunk())
    {
       tmp = get_next_class(cmt);
    }
 
-   if (tmp != nullptr)
+   if (tmp->IsNotNullChunk())
    {
-      out_txt.append(tmp->str);
+      out_txt.append(tmp->GetStr());
 
       while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
-         if (tmp->type != CT_DC_MEMBER)
+         if (tmp->IsNot(CT_DC_MEMBER))
          {
             break;
          }
@@ -2738,7 +2914,7 @@ static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt)
          if (tmp->IsNotNullChunk())
          {
             out_txt.append("::");
-            out_txt.append(tmp->str);
+            out_txt.append(tmp->GetStr());
          }
       }
       return(true);
@@ -2755,30 +2931,30 @@ static bool kw_fcn_message(Chunk *cmt, unc_text &out_txt)
    {
       return(false);
    }
-   out_txt.append(fcn->str);
+   out_txt.append(fcn->GetStr());
 
    Chunk *tmp  = fcn->GetNextNcNnl();
    Chunk *word = Chunk::NullChunkPtr;
 
    while (tmp->IsNotNullChunk())
    {
-      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-         || chunk_is_token(tmp, CT_SEMICOLON))
+      if (  tmp->Is(CT_BRACE_OPEN)
+         || tmp->Is(CT_SEMICOLON))
       {
          break;
       }
 
-      if (chunk_is_token(tmp, CT_OC_COLON))
+      if (tmp->Is(CT_OC_COLON))
       {
          if (word->IsNotNullChunk())
          {
-            out_txt.append(word->str);
+            out_txt.append(word->GetStr());
             word = Chunk::NullChunkPtr;
          }
          out_txt.append(":");
       }
 
-      if (chunk_is_token(tmp, CT_WORD))
+      if (tmp->Is(CT_WORD))
       {
          word = tmp;
       }
@@ -2792,10 +2968,10 @@ static bool kw_fcn_category(Chunk *cmt, unc_text &out_txt)
 {
    Chunk *category = get_prev_category(cmt);
 
-   if (category)
+   if (category->IsNotNullChunk())
    {
       out_txt.append('(');
-      out_txt.append(category->str);
+      out_txt.append(category->GetStr());
       out_txt.append(')');
    }
    return(true);
@@ -2806,9 +2982,9 @@ static bool kw_fcn_scope(Chunk *cmt, unc_text &out_txt)
 {
    Chunk *scope = get_next_scope(cmt);
 
-   if (scope)
+   if (scope->IsNotNullChunk())
    {
-      out_txt.append(scope->str);
+      out_txt.append(scope->GetStr());
       return(true);
    }
    return(false);
@@ -2819,19 +2995,18 @@ static bool kw_fcn_function(Chunk *cmt, unc_text &out_txt)
 {
    Chunk *fcn = get_next_function(cmt);
 
-   if (fcn)
+   if (fcn != nullptr)
    {
-      if (get_chunk_parent_type(fcn) == CT_OPERATOR)
+      if (fcn->GetParentType() == CT_OPERATOR)
       {
          out_txt.append("operator ");
       }
 
-      if (  fcn->prev != nullptr
-         && fcn->prev->type == CT_DESTRUCTOR)
+      if (fcn->GetPrev()->GetType() == CT_DESTRUCTOR)
       {
          out_txt.append('~');
       }
-      out_txt.append(fcn->str);
+      out_txt.append(fcn->GetStr());
       return(true);
    }
    return(false);
@@ -2851,15 +3026,15 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
    bool  has_param = true;
    bool  need_nl   = false;
 
-   if (chunk_is_token(fcn, CT_OC_MSG_DECL))
+   if (fcn->Is(CT_OC_MSG_DECL))
    {
       Chunk *tmp = fcn->GetNextNcNnl();
       has_param = false;
 
       while (tmp->IsNotNullChunk())
       {
-         if (  chunk_is_token(tmp, CT_BRACE_OPEN)
-            || chunk_is_token(tmp, CT_SEMICOLON))
+         if (  tmp->Is(CT_BRACE_OPEN)
+            || tmp->Is(CT_SEMICOLON))
          {
             break;
          }
@@ -2873,12 +3048,12 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
             need_nl = true;
             out_txt.append("@param");
             out_txt.append(" ");
-            out_txt.append(tmp->str);
+            out_txt.append(tmp->GetStr());
             out_txt.append(" TODO");
          }
          has_param = false;
 
-         if (chunk_is_token(tmp, CT_PAREN_CLOSE))
+         if (tmp->Is(CT_PAREN_CLOSE))
          {
             has_param = true;
          }
@@ -2888,13 +3063,13 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
    }
    else
    {
-      fpo = fcn->GetNextType(CT_FPAREN_OPEN, fcn->level);
+      fpo = fcn->GetNextType(CT_FPAREN_OPEN, fcn->GetLevel());
 
       if (fpo->IsNullChunk())
       {
          return(true);
       }
-      fpc = fpo->GetNextType(CT_FPAREN_CLOSE, fcn->level);
+      fpc = fpo->GetNextType(CT_FPAREN_CLOSE, fcn->GetLevel());
 
       if (fpc->IsNullChunk())
       {
@@ -2915,7 +3090,7 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
          tmp = fpo->GetNextNcNnl();
 
          if (  (tmp == fpc->GetPrevNcNnl())
-            && chunk_is_str(tmp, "void"))
+            && tmp->IsString("void"))
          {
             has_param = false;
          }
@@ -2929,7 +3104,7 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
 
       while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
-         if (  chunk_is_token(tmp, CT_COMMA)
+         if (  tmp->Is(CT_COMMA)
             || tmp == fpc)
          {
             if (need_nl)
@@ -2942,7 +3117,7 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
             if (prev->IsNotNullChunk())
             {
                out_txt.append(" ");
-               out_txt.append(prev->str);
+               out_txt.append(prev->GetStr());
                out_txt.append(" TODO");
             }
             prev = Chunk::NullChunkPtr;
@@ -2953,7 +3128,7 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
             }
          }
 
-         if (chunk_is_token(tmp, CT_WORD))
+         if (tmp->Is(CT_WORD))
          {
             prev = tmp;
          }
@@ -2964,14 +3139,14 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
 
    // For Objective-C we need to go to the previous chunk
    if (  tmp->IsNotNullChunk()
-      && get_chunk_parent_type(tmp) == CT_OC_MSG_DECL
-      && chunk_is_token(tmp, CT_PAREN_CLOSE))
+      && tmp->GetParentType() == CT_OC_MSG_DECL
+      && tmp->Is(CT_PAREN_CLOSE))
    {
       tmp = tmp->GetPrevNcNnl();
    }
 
    if (  tmp->IsNotNullChunk()
-      && !chunk_is_str(tmp, "void"))
+      && !tmp->IsString("void"))
    {
       if (need_nl)
       {
@@ -2992,11 +3167,11 @@ static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt)
       return(false);
    }
 
-   if (fcn->flags.test(PCF_IN_CLASS))
+   if (fcn->TestFlags(PCF_IN_CLASS))
    {
       // if inside a class, we need to find to the class name
-      Chunk *tmp = fcn->GetPrevType(CT_BRACE_OPEN, fcn->level - 1);
-      tmp = tmp->GetPrevType(CT_CLASS, tmp->level);
+      Chunk *tmp = fcn->GetPrevType(CT_BRACE_OPEN, fcn->GetLevel() - 1);
+      tmp = tmp->GetPrevType(CT_CLASS, tmp->GetLevel());
 
       if (tmp->IsNullChunk())
       {
@@ -3008,7 +3183,7 @@ static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt)
       }
 
       while (  tmp->IsNotNullChunk()
-            && chunk_is_token(tmp->GetNextNcNnl(), CT_DC_MEMBER))
+            && tmp->GetNextNcNnl()->Is(CT_DC_MEMBER))
       {
          tmp = tmp->GetNextNcNnl();
          tmp = tmp->GetNextNcNnl();
@@ -3016,7 +3191,7 @@ static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt)
 
       if (tmp->IsNotNullChunk())
       {
-         out_txt.append(tmp->str);
+         out_txt.append(tmp->GetStr());
          return(true);
       }
    }
@@ -3025,17 +3200,17 @@ static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt)
       // if outside a class, we expect "CLASS::METHOD(...)"
       Chunk *tmp = fcn->GetPrevNcNnl();
 
-      if (chunk_is_token(tmp, CT_OPERATOR))
+      if (tmp->Is(CT_OPERATOR))
       {
          tmp = tmp->GetPrevNcNnl();
       }
 
       if (  tmp->IsNotNullChunk()
-         && (  chunk_is_token(tmp, CT_DC_MEMBER)
-            || chunk_is_token(tmp, CT_MEMBER)))
+         && (  tmp->Is(CT_DC_MEMBER)
+            || tmp->Is(CT_MEMBER)))
       {
          tmp = tmp->GetPrevNcNnl();
-         out_txt.append(tmp->str);
+         out_txt.append(tmp->GetStr());
          return(true);
       }
    }
@@ -3078,7 +3253,7 @@ static void do_kw_subst(Chunk *pc)
 {
    for (const auto &kw : kw_subst_table)
    {
-      int idx = pc->str.find(kw.tag);
+      int idx = pc->GetStr().find(kw.tag);
 
       if (idx < 0)
       {
@@ -3092,7 +3267,7 @@ static void do_kw_subst(Chunk *pc)
          // if the replacement contains '\n' we need to fix the lead
          if (tmp_txt.find("\n") >= 0)
          {
-            size_t nl_idx = pc->str.rfind("\n", idx);
+            size_t nl_idx = pc->GetStr().rfind("\n", idx);
 
             if (nl_idx > 0)
             {
@@ -3102,14 +3277,14 @@ static void do_kw_subst(Chunk *pc)
                nl_idx++;
 
                while (  (nl_idx < static_cast<size_t>(idx))
-                     && !unc_isalnum(pc->str[nl_idx]))
+                     && !unc_isalnum(pc->GetStr()[nl_idx]))
                {
-                  nl_txt.append(pc->str[nl_idx++]);
+                  nl_txt.append(pc->Str()[nl_idx++]);
                }
                tmp_txt.replace("\n", nl_txt);
             }
          }
-         pc->str.replace(kw.tag, tmp_txt);
+         pc->Str().replace(kw.tag, tmp_txt);
       }
    }
 } // do_kw_subst
@@ -3124,8 +3299,8 @@ static void output_comment_multi_simple(Chunk *pc)
    }
    cmt_reflow cmt;
 
-   LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s', type is %s, orig_col is %zu, column is %zu\n",
-           __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_col, pc->column);
+   LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s', type is %s, orig col is %zu, column is %zu\n",
+           __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()), pc->GetOrigCol(), pc->GetColumn());
 
    output_cmt_start(cmt, pc);
 
@@ -3137,10 +3312,10 @@ static void output_comment_multi_simple(Chunk *pc)
    {
       int diff = 0;
 
-      if (chunk_is_newline(pc->GetPrev()))
+      if (pc->GetPrev()->IsNewline())
       {
          // The comment should be indented correctly
-         diff = pc->column - pc->orig_col;
+         diff = pc->GetColumn() - pc->GetOrigCol();
       }
       return(diff);
    }();
@@ -3149,24 +3324,24 @@ 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->str);
-   auto     enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->str);
+   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->column;
+   size_t   line_column = pc->GetColumn();
    size_t   cmt_idx     = 0;
 
    while (cmt_idx < pc->Len())
    {
-      int ch = pc->str[cmt_idx];
+      int ch = pc->GetStr()[cmt_idx];
       cmt_idx++;
 
       if (  cmt_idx > std::size_t(disable_processing_cmt_idx)
          && enable_processing_cmt_idx > disable_processing_cmt_idx)
       {
          auto     length = enable_processing_cmt_idx - disable_processing_cmt_idx;
-         unc_text verbatim_text(pc->str,
+         unc_text verbatim_text(pc->GetStr(),
                                 disable_processing_cmt_idx,
                                 length);
 
@@ -3178,9 +3353,9 @@ static void output_comment_multi_simple(Chunk *pc)
           * check for additional enable/disable processing comment strings that may
           * both be embedded within the same multi-line comment
           */
-         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str,
+         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->GetStr(),
                                                                              enable_processing_cmt_idx);
-         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->str,
+         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->GetStr(),
                                                                            enable_processing_cmt_idx);
 
          line.clear();
@@ -3217,7 +3392,7 @@ static void output_comment_multi_simple(Chunk *pc)
          ch = '\n';
 
          if (  (cmt_idx < pc->Len())
-            && (pc->str[cmt_idx] == '\n'))
+            && (pc->GetStr()[cmt_idx] == '\n'))
          {
             cmt_idx++;
          }
@@ -3254,8 +3429,8 @@ static void output_comment_multi_simple(Chunk *pc)
                if (line_count > 1)
                {
                   // apply comment column shift without underflowing
-                  line_column = (  col_diff < 0
-                                && (cast_abs(line_column, col_diff) > line_column))
+                  line_column = (col_diff<0
+                                          && (size_t)(abs(col_diff))> line_column)
                                 ? 0 : line_column + col_diff;
                }
                cmt.column = line_column;
@@ -3281,40 +3456,40 @@ static void generate_if_conditional_as_text(unc_text &dst, Chunk *ifdef)
    {
       if (column == -1)
       {
-         column = pc->column;
+         column = pc->GetColumn();
       }
 
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         || chunk_is_token(pc, CT_COMMENT_MULTI)
-         || chunk_is_token(pc, CT_COMMENT_CPP))
+      if (  pc->Is(CT_NEWLINE)
+         || pc->Is(CT_COMMENT_MULTI)
+         || pc->Is(CT_COMMENT_CPP))
       {
          break;
       }
-      else if (chunk_is_token(pc, CT_NL_CONT))
+      else if (pc->Is(CT_NL_CONT))
       {
          dst   += ' ';
          column = -1;
       }
-      else if (  chunk_is_token(pc, CT_COMMENT)
-              || chunk_is_token(pc, CT_COMMENT_EMBED))
+      else if (  pc->Is(CT_COMMENT)
+              || pc->Is(CT_COMMENT_EMBED))
       {
       }
-      else // if (chunk_is_token(pc, CT_JUNK)) || else
+      else // if (pc->Is(CT_JUNK)) || else
       {
-         for (int spacing = pc->column - column; spacing > 0; spacing--)
+         for (int spacing = pc->GetColumn() - column; spacing > 0; spacing--)
          {
             dst += ' ';
             column++;
          }
 
-         dst.append(pc->str);
+         dst.append(pc->GetStr());
          column += pc->Len();
       }
    }
 } // generate_if_conditional_as_text
 
 
-void add_long_preprocessor_conditional_block_comment(void)
+void add_long_preprocessor_conditional_block_comment()
 {
    Chunk *pp_start = nullptr;
    Chunk *pp_end   = nullptr;
@@ -3322,18 +3497,18 @@ void add_long_preprocessor_conditional_block_comment(void)
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       // just track the preproc level:
-      if (chunk_is_token(pc, CT_PREPROC))
+      if (pc->Is(CT_PREPROC))
       {
          pp_end = pp_start = pc;
       }
 
-      if (  pc->type != CT_PP_IF
+      if (  pc->IsNot(CT_PP_IF)
          || !pp_start)
       {
          continue;
       }
 #if 0
-      if (pc->flags.test(PCF_IN_PREPROC))
+      if (pc->TestFlags(PCF_IN_PREPROC))
       {
          continue;
       }
@@ -3348,38 +3523,38 @@ void add_long_preprocessor_conditional_block_comment(void)
       while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
          // just track the preproc level:
-         if (chunk_is_token(tmp, CT_PREPROC))
+         if (tmp->Is(CT_PREPROC))
          {
             pp_end = tmp;
          }
 
-         if (chunk_is_newline(tmp))
+         if (tmp->IsNewline())
          {
-            nl_count += tmp->nl_count;
+            nl_count += tmp->GetNlCount();
          }
-         else if (  pp_end->pp_level == pp_start->pp_level
-                 && (  chunk_is_token(tmp, CT_PP_ENDIF)
-                    || ((chunk_is_token(br_open, CT_PP_IF)) ? (chunk_is_token(tmp, CT_PP_ELSE)) : 0)))
+         else if (  pp_end->GetPpLevel() == pp_start->GetPpLevel()
+                 && (  tmp->Is(CT_PP_ENDIF)
+                    || ((br_open->Is(CT_PP_IF)) ? (tmp->Is(CT_PP_ELSE)) : 0)))
          {
             br_close = tmp;
 
-            LOG_FMT(LPPIF, "found #if / %s section on lines %zu and %zu, nl_count=%zu\n",
-                    (chunk_is_token(tmp, CT_PP_ENDIF) ? "#endif" : "#else"),
-                    br_open->orig_line, br_close->orig_line, nl_count);
+            LOG_FMT(LPPIF, "found #if / %s section on lines %zu and %zu, new line count=%zu\n",
+                    (tmp->Is(CT_PP_ENDIF) ? "#endif" : "#else"),
+                    br_open->GetOrigLine(), br_close->GetOrigLine(), nl_count);
 
             // Found the matching #else or #endif - make sure a newline is next
             tmp = tmp->GetNext();
 
             LOG_FMT(LPPIF, "next item type %d (is %s)\n",
-                    (tmp ? tmp->type : -1), (tmp ? chunk_is_newline(tmp) ? "newline"
+                    (tmp ? tmp->GetType() : -1), (tmp ? tmp->IsNewline() ? "newline"
                                              : tmp->IsComment() ? "comment" : "other" : "---"));
 
             if (  tmp->IsNullChunk()
-               || chunk_is_token(tmp, CT_NEWLINE)) // chunk_is_newline(tmp))
+               || tmp->Is(CT_NEWLINE)) // tmp->IsNewline())
             {
                size_t nl_min;
 
-               if (chunk_is_token(br_close, CT_PP_ENDIF))
+               if (br_close->Is(CT_PP_ENDIF))
                {
                   log_rule_B("mod_add_long_ifdef_endif_comment");
                   nl_min = options::mod_add_long_ifdef_endif_comment();
@@ -3389,8 +3564,8 @@ void add_long_preprocessor_conditional_block_comment(void)
                   log_rule_B("mod_add_long_ifdef_else_comment");
                   nl_min = options::mod_add_long_ifdef_else_comment();
                }
-               const char *txt = !tmp ? "EOF" : ((chunk_is_token(tmp, CT_PP_ENDIF)) ? "#endif" : "#else");
-               LOG_FMT(LPPIF, "#if / %s section candidate for augmenting when over NL threshold %zu != 0 (nl_count=%zu)\n",
+               const char *txt = !tmp ? "EOF" : ((tmp->Is(CT_PP_ENDIF)) ? "#endif" : "#else");
+               LOG_FMT(LPPIF, "#if / %s section candidate for augmenting when over NL threshold %zu != 0 (new line count=%zu)\n",
                        txt, nl_min, nl_count);
 
                if (  nl_min > 0
@@ -3403,7 +3578,7 @@ void add_long_preprocessor_conditional_block_comment(void)
                   unc_text str;
                   generate_if_conditional_as_text(str, br_open);
 
-                  LOG_FMT(LPPIF, "#if / %s section over threshold %zu (nl_count=%zu) --> insert comment after the %s: %s\n",
+                  LOG_FMT(LPPIF, "#if / %s section over threshold %zu (new line count=%zu) --> insert comment after the %s: %s\n",
                           txt, nl_min, nl_count, txt, str.c_str());
 
                   // Add a comment after the close brace
@@ -3412,7 +3587,7 @@ void add_long_preprocessor_conditional_block_comment(void)
             }
 
             // checks both the #else and #endif for a given level, only then look further in the main loop
-            if (chunk_is_token(br_close, CT_PP_ENDIF))
+            if (br_close->Is(CT_PP_ENDIF))
             {
                break;
             }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.h
index b3e685d9..f3f6026e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.h
@@ -36,7 +36,7 @@ void dump_step(const char *filename, const char *description);
  * in braces.cpp
  *
  * Note: since this concerns itself with the preprocessor -- which is line-oriented --
- * it turns out that just looking at pc->pp_level is NOT the right thing to do.
+ * it turns out that just looking at pc->GetPpLevel() is NOT the right thing to do.
  * See a --parsed dump if you don't believe this: an '#endif' will be one level
  * UP from the corresponding #ifdef when you look at the tokens 'ifdef' versus 'endif',
  * but it's a whole another story when you look at their CT_PREPROC ('#') tokens!
@@ -44,7 +44,7 @@ void dump_step(const char *filename, const char *description);
  * Hence we need to track and seek matching CT_PREPROC pp_levels here, which complicates
  * things a little bit, but not much.
  */
-void add_long_preprocessor_conditional_block_comment(void);
+void add_long_preprocessor_conditional_block_comment();
 
 
 #endif /* OUTPUT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.cpp
index 7b81175a..12992ff3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.cpp
@@ -8,9 +8,10 @@
 #include "parameter_pack_cleanup.h"
 
 #include "chunk.h"
+#include "uncrustify.h"
 
 
-void parameter_pack_cleanup(void)
+void parameter_pack_cleanup()
 {
    LOG_FUNC_ENTRY();
 
@@ -18,29 +19,26 @@ void parameter_pack_cleanup(void)
 
    while (pc->IsNotNullChunk())
    {
-      LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+      LOG_CHUNK(LTOK, pc);
 
       // look for template
-      if (chunk_is_token(pc, CT_TEMPLATE))                 // Issue #3309
+      if (pc->Is(CT_TEMPLATE))                 // Issue #3309
       {
-         Chunk *template_end = pc->GetNextType(CT_SEMICOLON, pc->level);
+         Chunk *template_end = pc->GetNextType(CT_SEMICOLON, pc->GetLevel());
 
          // look for a parameter pack
          while (pc->IsNotNullChunk())
          {
-            LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+            LOG_CHUNK(LTOK, pc);
 
-            if (chunk_is_token(pc, CT_PARAMETER_PACK))
+            if (pc->Is(CT_PARAMETER_PACK))
             {
                Chunk *parameter_pack = pc;
 
                // look for a token with the same text
                while (pc->IsNotNullChunk())
                {
-                  LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-                          __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+                  LOG_CHUNK(LTOK, pc);
 
                   if (pc == template_end)
                   {
@@ -49,7 +47,7 @@ void parameter_pack_cleanup(void)
 
                   if (strcmp(pc->Text(), parameter_pack->Text()) == 0)
                   {
-                     set_chunk_type(pc, CT_PARAMETER_PACK);
+                     pc->SetType(CT_PARAMETER_PACK);
                   }
                   pc = pc->GetNext();
                }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.h
index 97ff6b17..e3aa31ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.h
@@ -10,6 +10,6 @@
 
 #include "uncrustify_types.h"
 
-void parameter_pack_cleanup(void);
+void parameter_pack_cleanup();
 
 #endif /* PARAMETER_PACK_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.cpp
index 64f65f50..67d75a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.cpp
@@ -38,7 +38,7 @@ static void add_parens_between(Chunk *first, Chunk *last);
 static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest);
 
 
-void do_parens(void)
+void do_parens()
 {
    constexpr static auto LCURRENT = LPARADD;
 
@@ -53,15 +53,15 @@ void do_parens(void)
       while (  (pc = pc->GetNextNcNnl()) != nullptr
             && pc->IsNotNullChunk())
       {
-         if (  pc->type != CT_SPAREN_OPEN
-            || (  get_chunk_parent_type(pc) != CT_IF
-               && get_chunk_parent_type(pc) != CT_ELSEIF
-               && get_chunk_parent_type(pc) != CT_SWITCH))
+         if (  pc->IsNot(CT_SPAREN_OPEN)
+            || (  pc->GetParentType() != CT_IF
+               && pc->GetParentType() != CT_ELSEIF
+               && pc->GetParentType() != CT_SWITCH))
          {
             continue;
          }
          // Grab the close sparen
-         Chunk *pclose = pc->GetNextType(CT_SPAREN_CLOSE, pc->level, E_Scope::PREPROC);
+         Chunk *pclose = pc->GetNextType(CT_SPAREN_CLOSE, pc->GetLevel(), E_Scope::PREPROC);
 
          if (pclose->IsNotNullChunk())
          {
@@ -73,7 +73,7 @@ void do_parens(void)
 } // do_parens
 
 
-void do_parens_assign(void)                         // Issue #3316
+void do_parens_assign()                         // Issue #3316
 {
    constexpr static auto LCURRENT = LPARADD;
 
@@ -88,50 +88,50 @@ void do_parens_assign(void)                         // Issue #3316
       while (  (pc = pc->GetNextNcNnl()) != nullptr
             && pc->IsNotNullChunk())
       {
-         if (chunk_is_token(pc, CT_ASSIGN))
+         if (pc->Is(CT_ASSIGN))
          {
-            LOG_FMT(LPARADD, "%s(%d): orig_line is %zu, text is '%s', level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->Text(), pc->level);
+            LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->Text(), pc->GetLevel());
             // look before for a open sparen
-            size_t check_level = pc->level;
+            size_t check_level = pc->GetLevel();
             Chunk  *p          = pc->GetPrevNc(E_Scope::PREPROC);
 
             while (p->IsNotNullChunk())
             {
-               LOG_FMT(LPARADD, "%s(%d): orig_line is %zu, text is '%s', level is %zu, type is %s\n",
-                       __func__, __LINE__, p->orig_line, p->Text(), p->level, get_token_name(p->type));
+               LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
+                       __func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
 
-               //log_pcf_flags(LPARADD, p->flags);
-               if (p->flags.test(PCF_STMT_START))
+               //log_pcf_flags(LPARADD, p->GetFlags());
+               if (p->TestFlags(PCF_STMT_START))
                {
                   break;
                }
 
-               if (chunk_is_token(p, CT_PAREN_OPEN))
+               if (p->Is(CT_PAREN_OPEN))
                {
                   check_level--;
                }
 
-               if (chunk_is_token(p, CT_SPAREN_OPEN))
+               if (p->Is(CT_SPAREN_OPEN))
                {
                   break;
                }
                p = p->GetPrevNc(E_Scope::PREPROC);
 
-               if (p->level < check_level - 1)
+               if (p->GetLevel() < check_level - 1)
                {
                   break;
                }
             }
-            LOG_FMT(LPARADD, "%s(%d): orig_line is %zu, text is '%s', level is %zu, type is %s\n",
-                    __func__, __LINE__, p->orig_line, p->Text(), p->level, get_token_name(p->type));
+            LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
+                    __func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
 
-            if (get_chunk_parent_type(p) == CT_WHILE)
+            if (p->GetParentType() == CT_WHILE)
             {
                continue;
             }
             // Grab the semicolon
-            Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->level, E_Scope::PREPROC);
+            Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->GetLevel(), E_Scope::PREPROC);
 
             if (semicolon->IsNotNullChunk())
             {
@@ -144,7 +144,7 @@ void do_parens_assign(void)                         // Issue #3316
 } // do_parens_assign
 
 
-void do_parens_return(void)                         // Issue #3316
+void do_parens_return()                         // Issue #3316
 {
    constexpr static auto LCURRENT = LPARADD;
 
@@ -159,50 +159,50 @@ void do_parens_return(void)                         // Issue #3316
       while (  (pc = pc->GetNextNcNnl()) != nullptr
             && pc->IsNotNullChunk())
       {
-         if (chunk_is_token(pc, CT_RETURN))
+         if (pc->Is(CT_RETURN))
          {
-            LOG_FMT(LPARADD, "%s(%d): orig_line is %zu, text is '%s', level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->Text(), pc->level);
+            LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->Text(), pc->GetLevel());
             // look before for a open sparen
-            size_t check_level = pc->level;
+            size_t check_level = pc->GetLevel();
             Chunk  *p          = pc->GetPrevNc(E_Scope::PREPROC);
 
             while (p->IsNotNullChunk())
             {
-               LOG_FMT(LPARADD, "%s(%d): orig_line is %zu, text is '%s', level is %zu, type is %s\n",
-                       __func__, __LINE__, p->orig_line, p->Text(), p->level, get_token_name(p->type));
+               LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
+                       __func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
 
-               //log_pcf_flags(LPARADD, p->flags);
-               if (p->flags.test(PCF_STMT_START))
+               //log_pcf_flags(LPARADD, p->GetFlags());
+               if (p->TestFlags(PCF_STMT_START))
                {
                   break;
                }
 
-               if (chunk_is_token(p, CT_PAREN_OPEN))
+               if (p->Is(CT_PAREN_OPEN))
                {
                   check_level--;
                }
 
-               if (chunk_is_token(p, CT_SPAREN_OPEN))
+               if (p->Is(CT_SPAREN_OPEN))
                {
                   break;
                }
                p = p->GetPrevNc(E_Scope::PREPROC);
 
-               if (p->level < check_level - 1)
+               if (p->GetLevel() < check_level - 1)
                {
                   break;
                }
             }
-            LOG_FMT(LPARADD, "%s(%d): orig_line is %zu, text is '%s', level is %zu, type is %s\n",
-                    __func__, __LINE__, p->orig_line, p->Text(), p->level, get_token_name(p->type));
+            LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
+                    __func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
 
-            if (get_chunk_parent_type(p) == CT_WHILE)
+            if (p->GetParentType() == CT_WHILE)
             {
                continue;
             }
             // Grab the semicolon
-            Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->level, E_Scope::PREPROC);
+            Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->GetLevel(), E_Scope::PREPROC);
 
             if (semicolon->IsNotNullChunk())
             {
@@ -220,9 +220,9 @@ 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->orig_line,
-           first->Text(), first->level,
-           last->Text(), last->level);
+           __func__, __LINE__, first->GetOrigLine(),
+           first->Text(), first->GetLevel(),
+           last->Text(), last->GetLevel());
 
    // Don't do anything if we have a bad sequence, ie "&& )"
    Chunk *first_n = first->GetNextNcNnl();
@@ -233,38 +233,38 @@ static void add_parens_between(Chunk *first, Chunk *last)
    }
    Chunk pc;
 
-   set_chunk_type(&pc, CT_PAREN_OPEN);
-   pc.orig_line   = first_n->orig_line;
-   pc.orig_col    = first_n->orig_col;
-   pc.str         = "(";
-   pc.flags       = first_n->flags & PCF_COPY_FLAGS;
-   pc.level       = first_n->level;
-   pc.pp_level    = first_n->pp_level;
-   pc.brace_level = first_n->brace_level;
+   pc.SetType(CT_PAREN_OPEN);
+   pc.SetOrigLine(first_n->GetOrigLine());
+   pc.SetOrigCol(first_n->GetOrigCol());
+   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());
 
-   chunk_add_before(&pc, first_n);
+   pc.CopyAndAddBefore(first_n);
 
    Chunk *last_p = last->GetPrevNcNnl(E_Scope::PREPROC);
 
-   set_chunk_type(&pc, CT_PAREN_CLOSE);
-   pc.orig_line   = last_p->orig_line;
-   pc.orig_col    = last_p->orig_col;
-   pc.str         = ")";
-   pc.flags       = last_p->flags & PCF_COPY_FLAGS;
-   pc.level       = last_p->level;
-   pc.pp_level    = last_p->pp_level;
-   pc.brace_level = last_p->brace_level;
+   pc.SetType(CT_PAREN_CLOSE);
+   pc.SetOrigLine(last_p->GetOrigLine());
+   pc.SetOrigCol(last_p->GetOrigCol());
+   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());
 
-   chunk_add_after(&pc, last_p);
+   pc.CopyAndAddAfter(last_p);
 
    for (Chunk *tmp = first_n;
         tmp != last_p;
         tmp = tmp->GetNextNcNnl())
    {
-      tmp->level++;
+      tmp->SetLevel(tmp->GetLevel() + 1);
    }
 
-   last_p->level++;
+   last_p->SetLevel(last_p->GetLevel() + 1);
 } // add_parens_between
 
 
@@ -275,11 +275,11 @@ static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest)
    Chunk *ref        = popen;
    bool  hit_compare = false;
 
-   LOG_FMT(LPARADD, "%s(%d): nest is %d, popen on line %zu, orig_col is %zu, pclose on line %zu, orig_col is %zu, level is %zu\n",
+   LOG_FMT(LPARADD, "%s(%d): nest is %d, popen on line %zu, orig col is %zu, pclose on line %zu, orig col is %zu, level is %zu\n",
            __func__, __LINE__, nest,
-           popen->orig_line, popen->orig_col,
-           pclose->orig_line, pclose->orig_col,
-           popen->level);
+           popen->GetOrigLine(), popen->GetOrigCol(),
+           pclose->GetOrigLine(), pclose->GetOrigCol(),
+           popen->GetLevel());
 
    Chunk *pc = popen;
 
@@ -287,22 +287,22 @@ static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest)
          && pc->IsNotNullChunk()
          && pc != pclose)
    {
-      if (pc->flags.test(PCF_IN_PREPROC))
+      if (pc->TestFlags(PCF_IN_PREPROC))
       {
          LOG_FMT(LPARADD2, " -- bail on PP %s [%s] at line %zu col %zu, level %zu\n",
-                 get_token_name(pc->type),
-                 pc->Text(), pc->orig_line, pc->orig_col, pc->level);
+                 get_token_name(pc->GetType()),
+                 pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
          return;
       }
 
-      if (  chunk_is_token(pc, CT_BOOL)
-         || chunk_is_token(pc, CT_QUESTION)
-         || chunk_is_token(pc, CT_COND_COLON)
-         || chunk_is_token(pc, CT_COMMA))
+      if (  pc->Is(CT_BOOL)
+         || pc->Is(CT_QUESTION)
+         || pc->Is(CT_COND_COLON)
+         || pc->Is(CT_COMMA))
       {
          LOG_FMT(LPARADD2, " -- %s [%s] at line %zu col %zu, level %zu\n",
-                 get_token_name(pc->type),
-                 pc->Text(), pc->orig_line, pc->orig_col, pc->level);
+                 get_token_name(pc->GetType()),
+                 pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
 
          if (hit_compare)
          {
@@ -315,28 +315,28 @@ static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest)
          }
          ref = pc;
       }
-      else if (chunk_is_token(pc, CT_COMPARE))
+      else if (pc->Is(CT_COMPARE))
       {
-         LOG_FMT(LPARADD2, " -- compare '%s' at line %zu, orig_col is %zu, level is %zu\n",
-                 pc->Text(), pc->orig_line, pc->orig_col, pc->level);
+         LOG_FMT(LPARADD2, " -- compare '%s' at line %zu, orig col is %zu, level is %zu\n",
+                 pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
          hit_compare = true;
       }
-      else if (chunk_is_paren_open(pc))
+      else if (pc->IsParenOpen())
       {
-         Chunk *next = chunk_skip_to_match(pc);
+         Chunk *next = pc->GetClosingParen();
 
-         if (next != nullptr)
+         if (next->IsNotNullChunk())
          {
             check_bool_parens(pc, next, nest + 1);
             pc = next;
          }
       }
-      else if (  chunk_is_token(pc, CT_BRACE_OPEN)
-              || chunk_is_token(pc, CT_SQUARE_OPEN)
-              || chunk_is_token(pc, CT_ANGLE_OPEN))
+      else if (  pc->Is(CT_BRACE_OPEN)
+              || pc->Is(CT_SQUARE_OPEN)
+              || pc->Is(CT_ANGLE_OPEN))
       {
          // Skip [], {}, and <>
-         pc = chunk_skip_to_match(pc);
+         pc = pc->GetClosingParen();
       }
    }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.h
index 0c961529..cfcb9501 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.h
@@ -12,13 +12,13 @@
 
 
 //! add parenthesis
-void do_parens(void);
+void do_parens();
 
 
-void do_parens_assign(void);
+void do_parens_assign();
 
 
-void do_parens_return(void);
+void do_parens_return();
 
 
 #endif /* PARENS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.cpp
new file mode 100644
index 00000000..f731b9f7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.cpp
@@ -0,0 +1,54 @@
+/**
+ * @file parent_for_pp.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "parent_for_pp.h"
+
+#include "chunk.h"
+
+
+void do_parent_for_pp()
+{
+   LOG_FUNC_ENTRY();
+
+   vector<Chunk *> viz;
+
+   Chunk           *pc = Chunk::GetHead()->GetNextNcNnl();
+
+   while (pc->IsNotNullChunk())
+   {
+      // CT_PP_IF,            // #if, #ifdef, or #ifndef
+      // CT_PP_ELSE,          // #else or #elif
+      // CT_PP_ENDIF,         // #endif
+      if (pc->Is(CT_PP_IF))
+      {
+         LOG_FMT(LMCB, "%s(%d): IF: orig line %zu, orig col is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+         log_pcf_flags(LMCB, pc->GetFlags());
+         viz.push_back(pc);
+      }
+      else if (pc->Is(CT_PP_ELSE))
+      {
+         LOG_FMT(LMCB, "%s(%d): ELSE: orig line %zu, orig col is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+         log_pcf_flags(LMCB, pc->GetFlags());
+         size_t level = pc->GetPpLevel();
+         Chunk  *a    = viz.at(level - 1);
+         pc->SetParent(a);
+      }
+      else if (pc->Is(CT_PP_ENDIF))
+      {
+         LOG_FMT(LMCB, "%s(%d): ENDIF: orig line %zu, orig col is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+         log_pcf_flags(LMCB, pc->GetFlags());
+         size_t level = pc->GetPpLevel();
+         Chunk  *a    = viz.at(level);
+         pc->SetParent(a);
+         viz.pop_back();
+      }
+      pc = pc->GetNextNcNnl();
+   }
+} // do_parent_for_pp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.h
index cb069680..7e77700a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.h
@@ -11,7 +11,7 @@
 
 
 // mark the parent
-void do_parent_for_pp(void);
+void do_parent_for_pp();
 
 
 #endif /* PARENT_FOR_PP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.cpp
index 0a22bf72..da0a9461 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.cpp
@@ -56,10 +56,13 @@ static const char *pcf_names[] =
    "INCOMPLETE",        // 44
    "IN_LAMBDA",         // 45
    "WF_IF",             // 46
+   "NOT_POSSIBLE",      // 47
+   "IN_CONDITIONAL",    // 48                    Issue #3558
+   "PCF_OC_IN_BLOCK",   // 49
 };
 
 
-std::string pcf_flags_str(pcf_flags_t flags)
+std::string pcf_flags_str(T_PcfFlags flags)
 {
    char buffer[64];
 
@@ -76,7 +79,7 @@ std::string pcf_flags_str(pcf_flags_t flags)
 
    for (size_t i = 0; i < ARRAY_SIZE(pcf_names); ++i)
    {
-      if (flags & static_cast<pcf_flag_e>(pcf_bit(i)))
+      if (flags & static_cast<E_PcfFlag>(pcf_bit(i)))
       {
          if (first)
          {
@@ -95,7 +98,7 @@ std::string pcf_flags_str(pcf_flags_t flags)
 }
 
 
-void log_pcf_flags(log_sev_t sev, pcf_flags_t flags)
+void log_pcf_flags(log_sev_t sev, T_PcfFlags flags)
 {
    if (!log_sev_on(sev))
    {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.h
index f0c7bbd5..02e0b57c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.h
@@ -24,7 +24,7 @@ constexpr auto pcf_bit(size_t b) -> decltype(0ULL)
    return(1ULL << b);
 }
 
-enum pcf_flag_e : decltype ( 0ULL )
+enum E_PcfFlag : decltype ( 0ULL )
 {
 // Copy flags are in the lower 17 bits
    PCF_NONE            = 0ULL,
@@ -82,15 +82,17 @@ enum pcf_flag_e : decltype ( 0ULL )
    PCF_WF_IF           = pcf_bit(46),  //! #if for a whole file ifdef
    PCF_NOT_POSSIBLE    = pcf_bit(47),  //! it is not possible to make an one_liner
                                        //! because the line would be too long
+   PCF_IN_CONDITIONAL  = pcf_bit(48),  //! inside a conditional ternary expression
+   PCF_OC_IN_BLOCK     = pcf_bit(49),  //! inside OC block function
 };
 
-UNC_DECLARE_FLAGS(pcf_flags_t, pcf_flag_e);
-UNC_DECLARE_OPERATORS_FOR_FLAGS(pcf_flags_t);
+UNC_DECLARE_FLAGS(T_PcfFlags, E_PcfFlag);
+UNC_DECLARE_OPERATORS_FOR_FLAGS(T_PcfFlags);
 
-std::string pcf_flags_str(pcf_flags_t flags);
+std::string pcf_flags_str(T_PcfFlags flags);
 
 
-void log_pcf_flags(log_sev_t sev, pcf_flags_t flags);
+void log_pcf_flags(log_sev_t sev, T_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.76.0/src/pragma_cleanup.cpp
new file mode 100644
index 00000000..336a1272
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.cpp
@@ -0,0 +1,98 @@
+/**
+ * @file pragma_cleanup.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "pragma_cleanup.h"
+
+#include "chunk.h"
+#include "unc_tools.h"
+
+
+void pragma_cleanup()
+{
+   LOG_FUNC_ENTRY();
+
+   bool  preproc_found   = false;
+   bool  pragma_found    = false;
+   bool  parameter_found = false;
+
+   Chunk *pc = Chunk::GetHead();
+
+   while (pc->IsNotNullChunk())
+   {
+      LOG_CHUNK(LTOK, pc);
+
+      if (!preproc_found)
+      {
+         if (pc->Is(CT_PREPROC))
+         {
+            LOG_FMT(LMCB, "%s(%d): PREPROC found: orig line %zu, orig col is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+            log_pcf_flags(LMCB, pc->GetFlags());
+            preproc_found = true;
+         }
+      }
+      else
+      {
+         if (!pragma_found)
+         {
+            if (pc->Is(CT_PP_PRAGMA))
+            {
+               LOG_FMT(LMCB, "%s(%d): PP_PRAGMA found: orig line %zu, orig col is %zu\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+               log_pcf_flags(LMCB, pc->GetFlags());
+               pragma_found = true;
+            }
+         }
+         else
+         {
+            if (!parameter_found)
+            {
+               LOG_FMT(LMCB, "%s(%d): PARAMETER found: orig line %zu, orig col is %zu, Text is '%s'\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+               log_pcf_flags(LMCB, pc->GetFlags());
+
+               if (strcmp(pc->Text(), "endasm") == 0)
+               {
+                  pc->SetType(CT_PP_ENDASM);
+               }
+               else if (strcmp(pc->Text(), "region") == 0)
+               {
+                  pc->SetType(CT_PP_REGION);
+               }
+               //else if (strcmp(pc->Text(), "comment") == 0)
+               //{
+               //   pc->SetType(CT_PP_COMMENT);
+               //}
+               else
+               {
+                  pc->SetType(CT_PP_PRAGMA);
+               }
+               parameter_found = true;
+            }
+            else
+            {
+               LOG_FMT(LMCB, "%s(%d): orig line is %zu, orig col is %zu, Text is '%s'\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+
+               if (pc->IsNewline())
+               {
+                  // reset
+                  preproc_found   = false;
+                  pragma_found    = false;
+                  parameter_found = false;
+               }
+               else
+               {
+                  pc->SetType(CT_PP_IGNORE);
+               }
+            }
+         }
+      }
+      pc = pc->GetNext();
+   }
+   //prot_the_line(__func__, __LINE__, 3, 0);
+} // pragma_cleanup
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.h
new file mode 100644
index 00000000..47a3a03d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.h
@@ -0,0 +1,16 @@
+/**
+ * @file pragma_cleanup.h
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#ifndef PRAGMA_CLEANUP_H_INCLUDED
+#define PRAGMA_CLEANUP_H_INCLUDED
+
+
+// cleanup the pagma line(s)
+void pragma_cleanup();
+
+
+#endif /* PRAGMA_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/prototypes.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/prototypes.h
index 55fe35b6..55fe35b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/prototypes.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/prototypes.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/punctuators.cpp
index 6c9c41f4..6c9c41f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/punctuators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/punctuators.h
index ed4c3fa5..ed4c3fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/src/quick_align_again.cpp
new file mode 100644
index 00000000..5cc8bcd6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/quick_align_again.cpp
@@ -0,0 +1,53 @@
+/**
+ * @file quick_align_again.cpp
+ *
+ * @author  Guy Maurel
+ * split from align.cpp
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#include "quick_align_again.h"
+
+#include "align_stack.h"
+#include "chunk.h"
+
+
+void quick_align_again()
+{
+   LOG_FUNC_ENTRY();
+
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
+   {
+      char copy[1000];
+      LOG_FMT(LALAGAIN, "%s(%d): orig line is %zu, orig col is %zu, column is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetColumn(), pc->ElidedText(copy));
+
+      if (  pc->GetAlignmentData().next != nullptr
+         && 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;
+
+         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);
+         pc->SetFlagBits(PCF_WAS_ALIGNED);
+
+         for (Chunk *tmp = pc->GetAlignmentData().next; tmp != nullptr; tmp = tmp->GetAlignmentData().next)
+         {
+            tmp->SetFlagBits(PCF_WAS_ALIGNED);
+            as.Add(tmp->GetAlignmentData().start);
+            LOG_FMT(LALAGAIN, "%s(%d):    => tmp->Text() is '%s', orig line is %zu\n",
+                    __func__, __LINE__, tmp->Text(), tmp->GetOrigLine());
+         }
+
+         LOG_FMT(LALAGAIN, "\n");
+         as.End();
+      }
+   }
+} // quick_align_again
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/quick_align_again.h
index b31a450a..c370c612 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/quick_align_again.h
@@ -12,6 +12,6 @@
 
 #include "uncrustify_types.h"
 
-void quick_align_again(void);
+void quick_align_again();
 
 #endif /* QUICK_ALIGN_AGAIN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.cpp
index 90cf0abb..e06029f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.cpp
@@ -14,7 +14,7 @@
 using std::vector;
 
 
-void remove_duplicate_include(void)
+void remove_duplicate_include()
 {
    LOG_FUNC_ENTRY();
 
@@ -25,21 +25,21 @@ void remove_duplicate_include(void)
 
    while (pc->IsNotNullChunk())
    {
-      //LOG_FMT(LRMRETURN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s, parent_type is %s\n",
-      //        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
-      //        get_token_name(pc->type), get_token_name(pc->parent_type));
+      //LOG_FMT(LRMRETURN, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n",
+      //        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(),
+      //        get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
 
-      if (chunk_is_token(pc, CT_PREPROC))
+      if (pc->Is(CT_PREPROC))
       {
          preproc = pc;
       }
-      else if (chunk_is_token(pc, CT_PP_INCLUDE))
+      else if (pc->Is(CT_PP_INCLUDE))
       {
          Chunk *next = pc->GetNext();
 
-         //LOG_FMT(LRMRETURN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s, parent_type is %s\n",
-         //        __func__, __LINE__, next->orig_line, next->orig_col, next->Text(),
-         //        get_token_name(next->type), get_token_name(next->parent_type));
+         //LOG_FMT(LRMRETURN, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n",
+         //        __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text(),
+         //        get_token_name(next->GetType()), get_token_name(next->GetParentType()));
          if (includes.empty())
          {
             includes.push_back(next);
@@ -68,15 +68,15 @@ void remove_duplicate_include(void)
                   Chunk *comment = next->GetNext();
                   Chunk *eol     = next->GetNextNl();
                   pc = preproc->GetPrev();
-                  chunk_del(preproc);
-                  chunk_del(temp);
-                  chunk_del(next);
+                  Chunk::Delete(preproc);
+                  Chunk::Delete(temp);
+                  Chunk::Delete(next);
 
                   if (comment != eol)
                   {
-                     chunk_del(comment);
+                     Chunk::Delete(comment);
                   }
-                  chunk_del(eol);
+                  Chunk::Delete(eol);
                   break;
                }
                else
@@ -87,7 +87,7 @@ void remove_duplicate_include(void)
                }
             } // for (auto itc = includes.begin();
          } // if (includes.empty())
-      } // else if (chunk_is_token(pc, CT_PP_INCLUDE))
+      } // else if (pc->Is(CT_PP_INCLUDE))
       // get the next token
       pc = pc->GetNext();
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.h
index a7ade094..c58416c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.h
@@ -14,7 +14,7 @@
 /**
  * @brief Remove duplicate include
  */
-void remove_duplicate_include(void);
+void remove_duplicate_include();
 
 
 #endif /* REMOVE_DUPLICATE_INCLUDE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.cpp
index 6fe4d6f0..da7c9ba1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.cpp
@@ -13,7 +13,7 @@
 #include "uncrustify.h"
 
 
-void remove_extra_returns(void)
+void remove_extra_returns()
 {
    LOG_FUNC_ENTRY();
 
@@ -21,28 +21,28 @@ void remove_extra_returns(void)
 
    while (pc->IsNotNullChunk())
    {
-      LOG_FMT(LRMRETURN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
-              get_token_name(pc->type), get_token_name(pc->parent_type));
+      LOG_FMT(LRMRETURN, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(),
+              get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
 
-      if (  chunk_is_token(pc, CT_RETURN)
-         && !pc->flags.test(PCF_IN_PREPROC))
+      if (  pc->Is(CT_RETURN)
+         && !pc->TestFlags(PCF_IN_PREPROC))
       {
          // we might be in a class, check it                                     Issue #2705
          // look for a closing brace
          bool  remove_it      = false;
          Chunk *closing_brace = pc->GetNextType(CT_BRACE_CLOSE, 1);
-         LOG_FMT(LRMRETURN, "%s(%d): on orig_line %zu, level is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->level);
+         LOG_FMT(LRMRETURN, "%s(%d): on orig line %zu, level is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetLevel());
 
          if (closing_brace->IsNotNullChunk())
          {
-            if (get_chunk_parent_type(closing_brace) == CT_FUNC_CLASS_DEF)
+            if (closing_brace->GetParentType() == CT_FUNC_CLASS_DEF)
             {
                // we have a class. Do nothing
             }
-            else if (  get_chunk_parent_type(closing_brace) == CT_FUNC_DEF
-                    && pc->level < 2)
+            else if (  closing_brace->GetParentType() == CT_FUNC_DEF
+                    && pc->GetLevel() < 2)
             {
                remove_it = true;
             }
@@ -52,12 +52,12 @@ void remove_extra_returns(void)
             // it is not a class
             // look for a closing brace
             closing_brace = pc->GetNextType(CT_BRACE_CLOSE, 0);
-            LOG_FMT(LRMRETURN, "%s(%d): on orig_line %zu, level is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->level);
+            LOG_FMT(LRMRETURN, "%s(%d): on orig line %zu, level is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetLevel());
 
             if (closing_brace->IsNotNullChunk())
             {
-               if (get_chunk_parent_type(closing_brace) == CT_FUNC_DEF)
+               if (closing_brace->GetParentType() == CT_FUNC_DEF)
                {
                   remove_it = true;
                }
@@ -69,12 +69,12 @@ void remove_extra_returns(void)
             Chunk *semicolon = pc->GetNextNcNnl();
 
             if (  semicolon->IsNotNullChunk()
-               && chunk_is_token(semicolon, CT_SEMICOLON))
+               && semicolon->Is(CT_SEMICOLON))
             {
-               LOG_FMT(LRMRETURN, "%s(%d): Removed 'return;' on orig_line %zu\n",
-                       __func__, __LINE__, pc->orig_line);
-               chunk_del(pc);
-               chunk_del(semicolon);
+               LOG_FMT(LRMRETURN, "%s(%d): Removed 'return;' on orig line %zu\n",
+                       __func__, __LINE__, pc->GetOrigLine());
+               Chunk::Delete(pc);
+               Chunk::Delete(semicolon);
                pc = closing_brace;
             }
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.h
index df0974c9..85fc6429 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.h
@@ -15,7 +15,7 @@
  * @brief Remove unnecessary returns
  * that is remove 'return;' that appears as the last statement in a function
  */
-void remove_extra_returns(void);
+void remove_extra_returns();
 
 
 #endif /* REMOVE_EXTRA_RETURNS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.cpp
new file mode 100644
index 00000000..6b97ea7d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.cpp
@@ -0,0 +1,345 @@
+/**
+ * @file rewrite_infinite_loops.cpp
+ *
+ * @author  Alex Henrie
+ * @license GPL v2+
+ */
+
+#include "rewrite_infinite_loops.h"
+
+#include "chunk.h"
+#include "newlines.h"
+#include "uncrustify.h"
+
+
+using namespace uncrustify;
+
+
+static bool for_needs_rewrite(Chunk *pc, E_Token desired_type)
+{
+   // The 'for' statement needs to be rewritten if `for(;;)` is not the
+   // preferred syntax for infinite loops and this 'for' is an infinite loop
+   // with no extra tokens (such as inline comments).
+
+   if (desired_type == CT_FOR)
+   {
+      return(false);
+   }
+   pc = pc->GetNext();
+
+   if (!pc->Is(CT_SPAREN_OPEN))
+   {
+      return(false);
+   }
+   pc = pc->GetNext();
+
+   if (!pc->Is(CT_SEMICOLON))
+   {
+      return(false);
+   }
+   pc = pc->GetNext();
+
+   if (!pc->Is(CT_SEMICOLON))
+   {
+      return(false);
+   }
+   pc = pc->GetNext();
+
+   if (!pc->Is(CT_SPAREN_CLOSE))
+   {
+      return(false);
+   }
+   return(true);
+}
+
+
+static bool while_needs_rewrite(Chunk *keyword, E_Token desired_type, const char *desired_condition)
+{
+   // The 'while' statement needs to be rewritten if it has only the tokens that
+   // are strictly necessary (keyword, condition, two parentheses, and semicolon
+   // if do-while) and either the keyword or the condition needs to be changed.
+
+   Chunk *oparen    = keyword->GetNext();
+   Chunk *condition = oparen->GetNext();
+   Chunk *cparen    = condition->GetNext();
+
+   if (!oparen->Is(CT_SPAREN_OPEN))
+   {
+      return(false);
+   }
+
+   if (  strcmp(condition->Text(), "true") != 0
+      && strcmp(condition->Text(), "1") != 0)
+   {
+      return(false);
+   }
+
+   if (!cparen->Is(CT_SPAREN_CLOSE))
+   {
+      return(false);
+   }
+
+   if (keyword->Is(CT_WHILE_OF_DO))
+   {
+      Chunk *semicolon = cparen->GetNext();
+
+      if (!semicolon->Is(CT_SEMICOLON))
+      {
+         return(false);
+      }
+   }
+
+   if (!keyword->Is(desired_type))
+   {
+      return(true);
+   }
+
+   if (  strcmp(condition->Text(), "true") == 0
+      && strcmp(desired_condition, "true") != 0)
+   {
+      return(true);
+   }
+
+   if (  strcmp(condition->Text(), "1") == 0
+      && strcmp(desired_condition, "1") != 0)
+   {
+      return(true);
+   }
+   return(false);
+} // while_needs_rewrite
+
+
+void rewrite_loop_keyword(Chunk *keyword, E_Token new_type)
+{
+   keyword->SetType(new_type);
+
+   switch (new_type)
+   {
+   case CT_DO:
+      keyword->SetOrigColEnd(keyword->GetOrigColEnd() + strlen("do") - keyword->Len());
+      keyword->Str() = "do";
+      break;
+
+   case CT_WHILE:
+   case CT_WHILE_OF_DO:
+      keyword->SetOrigColEnd(keyword->GetOrigColEnd() + strlen("while") - keyword->Len());
+      keyword->Str() = "while";
+      break;
+
+   case CT_FOR:
+      keyword->SetOrigColEnd(keyword->GetOrigColEnd() + strlen("for") - keyword->Len());
+      keyword->Str() = "for";
+      break;
+
+   default:
+      break;
+   }
+}
+
+
+static void move_one_token(Chunk * &source, Chunk * &destination, E_Token parent_type)
+{
+   Chunk *next_source = source->GetNext();
+
+   // Place the source token immediately after the destination token, without
+   // any whitespace.
+
+   source->MoveAfter(destination);
+   source->SetColumn(destination->GetColumn() + destination->Len());
+   source->SetOrigCol(destination->GetOrigCol() + destination->Len());
+   source->SetOrigColEnd(source->GetOrigColEnd() + source->Len());
+   source->SetOrigPrevSp(0);
+   source->SetParentType(parent_type);
+
+   destination = source;
+   source      = next_source;
+}
+
+
+static void rewrite_loop_condition(Chunk * &source, Chunk * &destination,
+                                   E_Token desired_type, const char *desired_condition)
+{
+   // Move the opening parenthesis
+   move_one_token(source, destination, desired_type);
+
+   // Move the condition
+   if (desired_type == CT_FOR)
+   {
+      source->SetType(CT_SEMICOLON);
+      source->SetParentType(CT_FOR);
+      source->Str() = ";";
+      move_one_token(source, destination, desired_type);
+      destination = (destination)->CopyAndAddAfter(destination);
+   }
+   else
+   {
+      source->SetType(CT_WORD);
+      source->Str() = desired_condition;
+      move_one_token(source, destination, desired_type);
+   }
+
+   // If converting a 'for' to a 'while', delete the second semicolon
+   if (source->Is(CT_SEMICOLON))
+   {
+      Chunk *next_source = source->GetNext();
+      Chunk::Delete(source);
+      source = next_source;
+   }
+   // Move the closing parenthesis
+   move_one_token(source, destination, desired_type);
+}
+
+
+void rewrite_loop_in_place(Chunk *keyword, E_Token desired_type, const char *desired_condition)
+{
+   Chunk *top    = keyword->GetNext();
+   Chunk *bottom = keyword;
+
+   rewrite_loop_keyword(keyword, desired_type);
+   rewrite_loop_condition(top, bottom, desired_type, desired_condition);
+}
+
+
+static Chunk *find_start_brace(Chunk *pc)
+{
+   while (!pc->IsBraceOpen())
+   {
+      pc = pc->GetNextNcNnl();
+   }
+   return(pc);
+}
+
+
+void rewrite_infinite_loops()
+{
+   LOG_FUNC_ENTRY();
+
+   E_Token    desired_type;
+   const char *desired_condition;
+
+   switch (options::mod_infinite_loop())
+   {
+   case 1: // for(;;)
+      desired_type      = CT_FOR;
+      desired_condition = nullptr;
+      break;
+
+   case 2: // while(true)
+      desired_type      = CT_WHILE;
+      desired_condition = "true";
+      break;
+
+   case 3: // do...while(true)
+      desired_type      = CT_WHILE_OF_DO;
+      desired_condition = "true";
+      break;
+
+   case 4: // while(1)
+      desired_type      = CT_WHILE;
+      desired_condition = "1";
+      break;
+
+   case 5: // do...while(1)
+      desired_type      = CT_WHILE_OF_DO;
+      desired_condition = "1";
+      break;
+
+   default:
+      return;
+   }
+
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
+   {
+      if (pc->Is(CT_DO))
+      {
+         Chunk *start_brace   = find_start_brace(pc);
+         Chunk *end_brace     = start_brace->GetClosingParen();
+         Chunk *while_keyword = end_brace->GetNextNcNnl();
+
+         if (  !while_keyword->Is(CT_WHILE_OF_DO)
+            || !while_needs_rewrite(while_keyword, desired_type, desired_condition))
+         {
+            continue;
+         }
+
+         if (desired_type == CT_WHILE_OF_DO)
+         {
+            // Change the loop condition
+            rewrite_loop_in_place(while_keyword, desired_type, desired_condition);
+
+            // Update the braces' parent types
+            start_brace->SetParentType(CT_DO);
+            end_brace->SetParentType(CT_DO);
+         }
+         else
+         {
+            Chunk *top    = pc;
+            Chunk *bottom = while_keyword->GetNext();
+
+            // Change the 'do' at the top of the loop to a 'for' or a 'while'
+            rewrite_loop_keyword(top, desired_type);
+
+            // Delete the 'while' at the bottom of the loop
+            Chunk::Delete(while_keyword);
+
+            // Move the rest of the tokens from the bottom to the top
+            rewrite_loop_condition(bottom, top, desired_type, desired_condition);
+
+            // Delete the final semicolon
+            Chunk::Delete(bottom);
+
+            // Update the braces' parent types
+            start_brace->SetParentType(desired_type);
+            end_brace->SetParentType(desired_type);
+         }
+      }
+      else if (  (  pc->Is(CT_WHILE)
+                 && while_needs_rewrite(pc, desired_type, desired_condition))
+              || (  pc->Is(CT_FOR)
+                 && for_needs_rewrite(pc, desired_type)))
+      {
+         Chunk *start_brace = find_start_brace(pc);
+         Chunk *end_brace   = start_brace->GetClosingParen();
+
+         if (desired_type == CT_WHILE_OF_DO)
+         {
+            Chunk *top    = pc;
+            Chunk *bottom = end_brace;
+
+            if (bottom->Is(CT_VBRACE_CLOSE))
+            {
+               // Insert a new line before the new 'while' keyword
+               newline_add_before(bottom);
+            }
+            // Add a 'while' at the bottom of the loop
+            bottom = top->CopyAndAddAfter(bottom);
+            rewrite_loop_keyword(bottom, CT_WHILE_OF_DO);
+
+            // Change the 'while' at the top of the loop to a 'do'
+            rewrite_loop_keyword(top, CT_DO);
+            top = top->GetNext();
+
+            // Move the tokens from the top to the bottom
+            rewrite_loop_condition(top, bottom, desired_type, desired_condition);
+
+            // Add the final semicolon
+            bottom = bottom->CopyAndAddAfter(bottom);
+            bottom->SetType(CT_SEMICOLON);
+            bottom->Str() = ";";
+
+            // Update the braces' parent types
+            start_brace->SetParentType(CT_DO);
+            end_brace->SetParentType(CT_DO);
+         }
+         else
+         {
+            // Change 'for' to 'while' or vice-versa
+            rewrite_loop_in_place(pc, desired_type, desired_condition);
+
+            // Update the braces' parent types
+            start_brace->SetParentType(desired_type);
+            end_brace->SetParentType(desired_type);
+         }
+      }
+   }
+} // rewrite_infinite_loops
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.h
new file mode 100644
index 00000000..5b8f3fee
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.h
@@ -0,0 +1,19 @@
+/**
+ * @file rewrite_infinite_loops.h
+ * prototypes for rewrite_infinite_loops.cpp
+ *
+ * @author  Alex Henrie
+ * @license GPL v2+
+ */
+
+#ifndef REWRITE_INFINITE_LOOPS_H_INCLUDED
+#define REWRITE_INFINITE_LOOPS_H_INCLUDED
+
+
+/**
+ * @brief Rewrite infinite loops in a consistent syntax
+ */
+void rewrite_infinite_loops();
+
+
+#endif /* REWRITE_INFINITE_LOOPS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.cpp
new file mode 100644
index 00000000..390fdecb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.cpp
@@ -0,0 +1,153 @@
+/**
+ * @file semicolons.cpp
+ * Removes extra semicolons
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#include "semicolons.h"
+
+#include "prototypes.h"
+
+
+static void remove_semicolon(Chunk *pc);
+
+
+/**
+ * We are on a semicolon that is after an unidentified brace close.
+ * Check for what is before the brace open.
+ * Do not remove if it is a square close, word, type, or paren close.
+ */
+static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close);
+
+
+static void remove_semicolon(Chunk *pc)
+{
+   LOG_FUNC_ENTRY();
+   LOG_FMT(LDELSEMI, "%s(%d): Removed semicolon: orig line is %zu, orig col is %zu",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+   log_func_stack_inline(LDELSEMI);
+   // TODO: do we want to shift stuff back a column?
+   Chunk::Delete(pc);
+}
+
+
+void remove_extra_semicolons()
+{
+   LOG_FUNC_ENTRY();
+
+   Chunk *pc = Chunk::GetHead();
+
+   while (pc->IsNotNullChunk())
+   {
+      Chunk *next = pc->GetNextNcNnl();
+      Chunk *prev;
+
+      if (  pc->Is(CT_SEMICOLON)
+         && !pc->TestFlags(PCF_IN_PREPROC)
+         && (prev = pc->GetPrevNcNnl())->IsNotNullChunk())
+      {
+         LOG_FMT(LSCANSEMI, "%s(%d): Semi orig line is %zu, orig col is %zu, parent is %s, prev = '%s' [%s/%s]\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetParentType()),
+                 prev->Text(),
+                 get_token_name(prev->GetType()), get_token_name(prev->GetParentType()));
+
+         if (pc->GetParentType() == CT_TYPEDEF)
+         {
+            // keep it
+         }
+         else if (  prev->Is(CT_BRACE_CLOSE)
+                 && (  prev->GetParentType() == CT_IF
+                    || 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_DEF
+                    || prev->GetParentType() == CT_OC_MSG_DECL
+                    || prev->GetParentType() == CT_FUNC_CLASS_DEF
+                    || prev->GetParentType() == CT_NAMESPACE))
+         {
+            // 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())
+            {
+               Chunk *opening_brace = closing_brace->GetOpeningParen();
+
+               if (  opening_brace != nullptr
+                  && opening_brace->IsNotNullChunk())
+               {
+                  Chunk *equal_sign = opening_brace->GetPrevNcNnl();
+
+                  if (  equal_sign != nullptr
+                     && equal_sign->IsNotNullChunk()
+                     && equal_sign->Is(CT_ASSIGN))
+                  {
+                     // initialisation found
+                     code_block_found = false;
+                  }
+               }
+            }
+
+            if (code_block_found)
+            {
+               // code block found
+               remove_semicolon(pc);
+            }
+         }
+         else if (  prev->Is(CT_BRACE_CLOSE)
+                 && prev->GetParentType() == CT_NONE)
+         {
+            check_unknown_brace_close(pc, prev);
+         }
+         else if (  prev->Is(CT_SEMICOLON)
+                 && prev->GetParentType() != CT_FOR)
+         {
+            remove_semicolon(pc);
+         }
+         else if (  language_is_set(LANG_D)
+                 && (  prev->GetParentType() == CT_ENUM
+                    || prev->GetParentType() == CT_UNION
+                    || prev->GetParentType() == CT_STRUCT))
+         {
+            remove_semicolon(pc);
+         }
+         else if (  language_is_set(LANG_JAVA)
+                 && prev->GetParentType() == CT_SYNCHRONIZED)
+         {
+            remove_semicolon(pc);
+         }
+         else if (prev->Is(CT_BRACE_OPEN))
+         {
+            remove_semicolon(pc);
+         }
+      }
+      pc = next;
+   }
+} // remove_extra_semicolons
+
+
+static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close)
+{
+   LOG_FUNC_ENTRY();
+   Chunk *pc = brace_close->GetPrevType(CT_BRACE_OPEN, brace_close->GetLevel());
+
+   pc = pc->GetPrevNcNnl();
+
+   if (  pc->IsNotNullChunk()
+      && 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->IsParenClose())
+   {
+      remove_semicolon(semi);
+   }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.h
index c0542a76..19591574 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.h
@@ -20,7 +20,7 @@
  *  - after an open brace
  *  - when not in a #DEFINE
  */
-void remove_extra_semicolons(void);
+void remove_extra_semicolons();
 
 
 #endif /* SEMICOLONS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.cpp
index 888569f2..27152101 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.cpp
@@ -12,6 +12,7 @@
 #include "prototypes.h"
 
 #include <regex>
+#include <unordered_map>
 
 constexpr static auto LCURRENT = LSORT;
 
@@ -36,7 +37,9 @@ struct include_category
 };
 
 
-include_category *include_categories[kIncludeCategoriesCount];
+include_category                 *include_categories[kIncludeCategoriesCount];
+unordered_map<Chunk *, int>      chunk_priority_cache;
+unordered_map<std::string, bool> filename_without_ext_cache;
 
 
 /**
@@ -49,13 +52,11 @@ include_category *include_categories[kIncludeCategoriesCount];
  * @retval  > 0
  * @retval  < 0
  */
-static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare = false);
+static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare);
 
 
 /**
- * Sorting should be pretty rare and should usually only include a few chunks.
- * We need to minimize the number of swaps, as those are expensive.
- * So, we do a min sort.
+ * Sort all of the chunks in O(n log n) time with a maximum of O(n) swaps
  */
 static void do_the_sort(Chunk **chunks, size_t num_chunks);
 
@@ -96,6 +97,9 @@ static void prepare_categories()
 
 static void cleanup_categories()
 {
+   chunk_priority_cache.clear();
+   filename_without_ext_cache.clear();
+
    for (auto &include_category : include_categories)
    {
       if (include_category == nullptr)
@@ -110,18 +114,26 @@ static void cleanup_categories()
 
 static int get_chunk_priority(Chunk *pc)
 {
+   if (chunk_priority_cache.count(pc) > 0)
+   {
+      return(chunk_priority_cache[pc]);
+   }
+   int category = kIncludeCategoriesCount;
+
    for (int i = 0; i < kIncludeCategoriesCount; i++)
    {
       if (include_categories[i] != nullptr)
       {
          if (std::regex_match(pc->Text(), include_categories[i]->regex))
          {
-            return(i);
+            category = i;
+            break;
          }
       }
    }
 
-   return(kIncludeCategoriesCount);
+   chunk_priority_cache[pc] = category;
+   return(category);
 }
 
 
@@ -130,6 +142,10 @@ static int get_chunk_priority(Chunk *pc)
  */
 static bool text_contains_filename_without_ext(const char *text)
 {
+   if (filename_without_ext_cache.count(text) > 0)
+   {
+      return(filename_without_ext_cache[text]);
+   }
    std::string filepath             = cpd.filename;
    size_t      slash_idx            = filepath.find_last_of("/\\");
    std::string filename_without_ext = filepath;
@@ -145,7 +161,8 @@ static bool text_contains_filename_without_ext(const char *text)
    const std::string sanitized_filename = std::regex_replace(filename_without_ext, special_chars, R"(\$&)");
    const std::regex  filename_pattern   = std::regex("\\S?" + sanitized_filename + "\\b.*");
 
-   return(std::regex_match(text, filename_pattern));
+   filename_without_ext_cache[text] = std::regex_match(text, filename_pattern);
+   return(filename_without_ext_cache[text]);
 }
 
 
@@ -182,11 +199,11 @@ static bool has_dot(const unc_text &chunk_text)
  */
 static unc_text chunk_sort_str(Chunk *pc)
 {
-   if (get_chunk_parent_type(pc) == CT_PP_INCLUDE)
+   if (pc->GetParentType() == CT_PP_INCLUDE)
    {
-      return(unc_text{ pc->str, 0, pc->Len() - 1 });
+      return(unc_text{ pc->GetStr(), 0, pc->Len() - 1 });
    }
-   return(pc->str);
+   return(pc->GetStr());
 }
 
 
@@ -195,9 +212,9 @@ static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LSORT, "%s(%d): @begin pc1->len is %zu, line is %zu, column is %zu\n",
-           __func__, __LINE__, pc1->Len(), pc1->orig_line, pc1->orig_col);
+           __func__, __LINE__, pc1->Len(), pc1->GetOrigLine(), pc1->GetOrigCol());
    LOG_FMT(LSORT, "%s(%d): @begin pc2->len is %zu, line is %zu, column is %zu\n",
-           __func__, __LINE__, pc2->Len(), pc2->orig_line, pc2->orig_col);
+           __func__, __LINE__, pc2->Len(), pc2->GetOrigLine(), pc2->GetOrigCol());
 
    if (pc1 == pc2) // same chunk is always identical thus return 0 differences
    {
@@ -273,9 +290,9 @@ static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare)
          return(ppc1 - ppc2);
       }
       LOG_FMT(LSORT, "%s(%d): text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->orig_line, pc1->orig_col);
+              __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->GetOrigLine(), pc1->GetOrigCol());
       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->orig_line, pc2->orig_col);
+              __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);
       LOG_FMT(LSORT, "%s(%d): ret_val is %d\n",
@@ -293,46 +310,46 @@ static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare)
       // Same word, same length. Step to the next chunk.
       pc1 = pc1->GetNext();
       LOG_FMT(LSORT, "%s(%d): text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->orig_line, pc1->orig_col);
+              __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->GetOrigLine(), pc1->GetOrigCol());
 
-      if (chunk_is_token(pc1, CT_MEMBER))
+      if (pc1->Is(CT_MEMBER))
       {
          pc1 = pc1->GetNext();
          LOG_FMT(LSORT, "%s(%d): text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-                 __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->orig_line, pc1->orig_col);
+                 __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->GetOrigLine(), pc1->GetOrigCol());
       }
       pc2 = pc2->GetNext();
       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->orig_line, pc2->orig_col);
+              __func__, __LINE__, pc2->Text(), pc2->Len(), pc2->GetOrigLine(), pc2->GetOrigCol());
 
-      if (chunk_is_token(pc2, CT_MEMBER))
+      if (pc2->Is(CT_MEMBER))
       {
          pc2 = pc2->GetNext();
          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->orig_line, pc2->orig_col);
+                 __func__, __LINE__, pc2->Text(), pc2->Len(), pc2->GetOrigLine(), pc2->GetOrigCol());
       }
       LOG_FMT(LSORT, "%s(%d): >>>text is %s, pc1->len is %zu, line is %zu, column is %zu\n",
-              __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->orig_line, pc1->orig_col);
+              __func__, __LINE__, pc1->Text(), pc1->Len(), pc1->GetOrigLine(), pc1->GetOrigCol());
       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->orig_line, pc2->orig_col);
+              __func__, __LINE__, pc2->Text(), pc2->Len(), pc2->GetOrigLine(), pc2->GetOrigCol());
 
       // If we hit a newline or nullptr, we are done
       if (  pc1->IsNullChunk()
-         || chunk_is_newline(pc1)
+         || pc1->IsNewline()
          || pc2->IsNullChunk()
-         || chunk_is_newline(pc2))
+         || pc2->IsNewline())
       {
          break;
       }
    }
 
    if (  pc1->IsNullChunk()
-      || !chunk_is_newline(pc2))
+      || !pc2->IsNewline())
    {
       return(-1);
    }
 
-   if (!chunk_is_newline(pc1))
+   if (!pc1->IsNewline())
    {
       return(1);
    }
@@ -341,9 +358,7 @@ static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare)
 
 
 /**
- * Sorting should be pretty rare and should usually only include a few chunks.
- * We need to minimize the number of swaps, as those are expensive.
- * So, we do a min sort.
+ * Sort all of the chunks in O(n log n) time with a maximum of O(n) swaps
  */
 static void do_the_sort(Chunk **chunks, size_t num_chunks)
 {
@@ -359,41 +374,39 @@ static void do_the_sort(Chunk **chunks, size_t num_chunks)
 
    LOG_FMT(LSORT, "\n");
 
-   size_t start_idx;
-
    log_rule_B("mod_sort_case_sensitive");
    bool take_care = options::mod_sort_case_sensitive();                    // Issue #2091
 
-   for (start_idx = 0; start_idx < (num_chunks - 1); start_idx++)
+   // Sort an array of the chunk positions in order to minimize the number of swaps
+   std::vector<size_t> chunk_positions(num_chunks);
+
+   for (size_t idx = 0; idx < num_chunks; idx++)
    {
-      // Find the index of the minimum value
-      size_t min_idx = start_idx;
+      chunk_positions[idx] = idx;
+   }
 
-      for (size_t idx = start_idx + 1; idx < num_chunks; idx++)
-      {
-         if (compare_chunks(chunks[idx], chunks[min_idx], take_care) < 0)  // Issue #2091
-         {
-            min_idx = idx;
-         }
-      }
+   sort(chunk_positions.begin(), chunk_positions.end(), [chunks, take_care](const size_t &l, const size_t &r) {
+      return(compare_chunks(chunks[l], chunks[r], take_care) < 0);
+   });
 
-      // Swap the lines if the minimum isn't the first entry
-      if (min_idx != start_idx)
+   // Swap the chunk positions
+   for (size_t idx = 0; idx < num_chunks; idx++)
+   {
+      if (chunk_positions[idx] != idx)
       {
-         chunk_swap_lines(chunks[start_idx], chunks[min_idx]);
          log_rule_B("mod_sort_incl_import_grouping_enabled");
 
-         if (options::mod_sort_incl_import_grouping_enabled())
-         {
-            Chunk *pc = chunks[min_idx];
-            chunks[min_idx]   = chunks[start_idx];
-            chunks[start_idx] = pc;
-         }
-         else
-         {
-            // Don't need to swap, since we only want the side-effects
-            chunks[min_idx] = chunks[start_idx];
-         }
+         const size_t from = chunk_positions[idx];
+         const size_t to   = chunk_positions[from];
+         chunks[from]->SwapLines(chunks[to]);
+
+         Chunk *pc = chunks[from];
+         chunks[from] = chunks[to];
+         chunks[to]   = pc;
+
+         chunk_positions[from] = from;
+         chunk_positions[idx]  = to;
+         idx--;
       }
    }
 } // do_the_sort
@@ -414,7 +427,7 @@ static void remove_blank_lines_between_imports(Chunk **chunks, size_t num_chunks
    for (size_t idx = 0; idx < (num_chunks - 1); idx++)
    {
       Chunk *chunk1 = chunks[idx]->GetNextNl();
-      chunk1->nl_count = 1;
+      chunk1->SetNlCount(1);
       MARK_CHANGE();
    }
 }
@@ -427,24 +440,23 @@ static void delete_chunks_on_line_having_chunk(Chunk *chunk)
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *pc = chunk_first_on_line(chunk);
+   Chunk *pc = chunk->GetFirstChunkOnLine();
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk()
+   while (  pc->IsNotNullChunk()
          && !pc->IsComment())
    {
       Chunk *next_pc = pc->GetNext();
-      LOG_FMT(LCHUNK, "%s(%d): Removed '%s' on orig_line %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line);
+      LOG_FMT(LCHUNK, "%s(%d): Removed '%s' on orig line %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine());
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         chunk_del(pc);
+         Chunk::Delete(pc);
          break;
       }
       else
       {
-         chunk_del(pc);
+         Chunk::Delete(pc);
       }
       pc = next_pc;
    }
@@ -483,9 +495,9 @@ static void dedupe_imports(Chunk **chunks, size_t num_chunks)
  */
 static void blankline_add_before(Chunk *pc)
 {
-   Chunk *newline = newline_add_before(chunk_first_on_line(pc));
+   Chunk *newline = newline_add_before(pc->GetFirstChunkOnLine());
 
-   if (newline->nl_count < 2)
+   if (newline->GetNlCount() < 2)
    {
       double_newline(newline);
    }
@@ -505,9 +517,9 @@ static void group_imports_by_adding_newlines(Chunk **chunks, size_t num_chunks)
 
    for (size_t idx = 0; idx < num_chunks; idx++)
    {
-      if (chunks[idx]->str.size() > 0)
+      if (chunks[idx]->GetStr().size() > 0)
       {
-         c_idx = chunks[idx]->str.at(0);
+         c_idx = chunks[idx]->GetStr().at(0);
       }
       else
       {
@@ -528,7 +540,7 @@ static void group_imports_by_adding_newlines(Chunk **chunks, size_t num_chunks)
 
    for (size_t idx = 0; idx < num_chunks; idx++)
    {
-      chunk_has_dot = has_dot(chunks[idx]->str);
+      chunk_has_dot = has_dot(chunks[idx]->GetStr());
 
       if (  chunk_last_has_dot != chunk_has_dot
          && idx > 0)
@@ -573,7 +585,7 @@ static void group_imports_by_adding_newlines(Chunk **chunks, size_t num_chunks)
 } // group_imports_by_adding_newlines
 
 
-void sort_imports(void)
+void sort_imports()
 {
    LOG_FUNC_ENTRY();
    const int max_number_to_sort                        = 1024;
@@ -598,21 +610,21 @@ void sort_imports(void)
       // import is seen are ignore from sorting.
       if (  options::mod_sort_incl_import_grouping_enabled()
          && p_imp_last != nullptr
-         && (pc->orig_line - p_imp_last->orig_line) > max_lines_to_check_for_sort_after_include)
+         && (pc->GetOrigLine() - p_imp_last->GetOrigLine()) > max_lines_to_check_for_sort_after_include)
       {
          break;
       }
       Chunk *next = pc->GetNext();
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          bool did_import = false;
 
          if (  p_imp != nullptr
             && p_imp->IsNotNullChunk()
             && p_last != nullptr
-            && (  chunk_is_token(p_last, CT_SEMICOLON)
-               || p_imp->flags.test(PCF_IN_PREPROC)))
+            && (  p_last->Is(CT_SEMICOLON)
+               || p_imp->TestFlags(PCF_IN_PREPROC)))
          {
             if (num_chunks < max_number_to_sort)
             {
@@ -625,8 +637,7 @@ void sort_imports(void)
                fprintf(stderr, "Number of 'import' to be sorted is too big for the current value %d.\n", max_number_to_sort);
                fprintf(stderr, "Please make a report.\n");
                log_flush(true);
-               cpd.error_count++;
-               exit(2);
+               exit(EX_SOFTWARE);
             }
             did_import = true;
          }
@@ -634,10 +645,10 @@ void sort_imports(void)
 
          if (  !did_import
             || (  !options::mod_sort_incl_import_grouping_enabled()
-               && pc->nl_count > 1)
+               && pc->GetNlCount() > 1)
             || (  options::mod_sort_incl_import_grouping_enabled()
                && p_imp_last != nullptr
-               && (pc->orig_line - p_imp_last->orig_line) > max_gap_threshold_between_include_to_sort)
+               && (pc->GetOrigLine() - p_imp_last->GetOrigLine()) > max_gap_threshold_between_include_to_sort)
             || next->IsNullChunk())
          {
             if (num_chunks > 1)
@@ -662,7 +673,7 @@ void sort_imports(void)
          p_imp      = nullptr;
          p_last     = nullptr;
       }
-      else if (chunk_is_token(pc, CT_IMPORT))
+      else if (pc->Is(CT_IMPORT))
       {
          log_rule_B("mod_sort_import");
 
@@ -671,7 +682,7 @@ void sort_imports(void)
             p_imp = pc->GetNext();
          }
       }
-      else if (chunk_is_token(pc, CT_USING))
+      else if (pc->Is(CT_USING))
       {
          log_rule_B("mod_sort_using");
 
@@ -680,7 +691,7 @@ void sort_imports(void)
             p_imp = pc->GetNext();
          }
       }
-      else if (chunk_is_token(pc, CT_PP_INCLUDE))
+      else if (pc->Is(CT_PP_INCLUDE))
       {
          log_rule_B("mod_sort_include");
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.h
index 5d767824..8d518df8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.h
@@ -18,7 +18,7 @@
  * @todo better use a chunk pointer parameter
  * instead of a global variable
  */
-void sort_imports(void);
+void sort_imports();
 
 
 #endif /* SORTING_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.cpp
index e907d1ef..2e6dafde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.cpp
@@ -2,7 +2,7 @@
  * @file space.cpp
  * Adds or removes inter-chunk spaces.
  *
- * Informations
+ * Information
  *   "Ignore" means do not change it.
  *   "Add" in the context of spaces means make sure there is at least 1.
  *   "Add" elsewhere means make sure one is present.
@@ -13,12 +13,13 @@
  *   Rmk: spaces = space + nl
  *
  * @author  Ben Gardner
- * @author  Guy Maurel, 2015-2021
+ * @author  Guy Maurel, 2015-2022
  * @license GPL v2+
  */
 
 #include "space.h"
 
+#include "add_space_table.h"
 #include "log_rules.h"
 #include "options_for_QT.h"
 #include "punctuators.h"
@@ -54,71 +55,6 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp);
  */
 static iarf_e ensure_force_space(Chunk *first, Chunk *second, iarf_e av);
 
-//! type that stores two chunks between those no space shall occur
-struct no_space_table_t
-{
-   E_Token first;  //! first  chunk
-   E_Token second; //! second chunk
-};
-
-
-/**
- * this table lists out all combos where a space MUST be present
- * CT_UNKNOWN is a wildcard.
- *
- * TODO: some of these are no longer needed.
- */
-const no_space_table_t add_space_table[] =
-{
-#include "add_space_table.h"
-};
-
-
-/**
- * this table lists out all combos where a space should NOT be present
- * CT_UNKNOWN is a wildcard.
- *
- * TODO: some of these are no longer needed.
- */
-const no_space_table_t no_space_table[] =
-{
-   { CT_OC_AT,          CT_UNKNOWN      },
-   { CT_INCDEC_BEFORE,  CT_WORD         },
-   { CT_UNKNOWN,        CT_INCDEC_AFTER },
-   { CT_UNKNOWN,        CT_LABEL_COLON  },
-   { CT_UNKNOWN,        CT_ACCESS_COLON },
-   { CT_UNKNOWN,        CT_SEMICOLON    },
-   { CT_UNKNOWN,        CT_D_TEMPLATE   },
-   { CT_D_TEMPLATE,     CT_UNKNOWN      },
-   { CT_MACRO_FUNC,     CT_FPAREN_OPEN  },
-   { CT_PAREN_OPEN,     CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_PAREN_CLOSE  },
-   { CT_FPAREN_OPEN,    CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_SPAREN_CLOSE },
-   { CT_SPAREN_OPEN,    CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_FPAREN_CLOSE },
-   { CT_UNKNOWN,        CT_COMMA        },
-   { CT_POS,            CT_UNKNOWN      },
-   { CT_STAR,           CT_UNKNOWN      },
-   { CT_VBRACE_CLOSE,   CT_UNKNOWN      },
-   { CT_VBRACE_OPEN,    CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_VBRACE_CLOSE },
-   { CT_UNKNOWN,        CT_VBRACE_OPEN  },
-   { CT_PREPROC,        CT_UNKNOWN      },
-   { CT_PREPROC_INDENT, CT_UNKNOWN      },
-   { CT_NEG,            CT_UNKNOWN      },
-   { CT_UNKNOWN,        CT_SQUARE_OPEN  },
-   { CT_UNKNOWN,        CT_SQUARE_CLOSE },
-   { CT_SQUARE_OPEN,    CT_UNKNOWN      },
-   { CT_PAREN_CLOSE,    CT_WORD         },
-   { CT_PAREN_CLOSE,    CT_FUNC_DEF     },
-   { CT_PAREN_CLOSE,    CT_FUNC_CALL    },
-   { CT_PAREN_CLOSE,    CT_ADDR         },
-   { CT_PAREN_CLOSE,    CT_FPAREN_OPEN  },
-   { CT_OC_SEL_NAME,    CT_OC_SEL_NAME  },
-   { CT_TYPENAME,       CT_TYPE         },
-};
-
 
 bool token_is_within_trailing_return(Chunk *pc)
 {
@@ -134,12 +70,12 @@ bool token_is_within_trailing_return(Chunk *pc)
 
    while (prev->IsNotNullChunk())
    {
-      if (chunk_is_token(prev, CT_TRAILING_RET))
+      if (prev->Is(CT_TRAILING_RET))
       {
          return(true);
       }
-      else if (  chunk_is_token(prev, CT_FPAREN_CLOSE)
-              || chunk_is_token(prev, CT_FPAREN_OPEN))
+      else if (  prev->Is(CT_FPAREN_CLOSE)
+              || prev->Is(CT_FPAREN_OPEN))
       {
          return(false);
       }
@@ -160,35 +96,28 @@ 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",
-           __func__, __LINE__, first->orig_line, first->orig_col, first->Text(), get_token_name(first->type));
+   LOG_FMT(LSPACE, "%s(%d): orig line is %zu, orig col is %zu, first Text() '%s', type is %s\n",
+           __func__, __LINE__, first->GetOrigLine(), first->GetOrigCol(), first->Text(), get_token_name(first->GetType()));
 
    min_sp = 1;
 
-   if (  chunk_is_token(first, CT_IGNORED)
-      || chunk_is_token(second, CT_IGNORED))
-   {
-      log_rule("REMOVE");
-      return(IARF_REMOVE);
-   }
-
-   if (  chunk_is_token(first, CT_PP_IGNORE)
-      && chunk_is_token(second, CT_PP_IGNORE))
+   if (  first->Is(CT_PP_IGNORE)
+      && second->Is(CT_PP_IGNORE))
    {
       // Leave spacing alone between PP_IGNORE tokens as we don't want the default behavior (which is ADD).
       log_rule("PP_IGNORE");
       return(IARF_IGNORE);
    }
 
-   if (  chunk_is_token(first, CT_PP)
-      || chunk_is_token(second, CT_PP))
+   if (  first->Is(CT_PP)
+      || second->Is(CT_PP))
    {
       // Add or remove space around preprocessor '##' concatenation operator.
       log_rule("sp_pp_concat");
       return(options::sp_pp_concat());
    }
 
-   if (chunk_is_token(first, CT_POUND))
+   if (first->Is(CT_POUND))
    {
       // Add or remove space after preprocessor '#' stringify operator.
       // Also affects the '#@' charizing operator.
@@ -196,9 +125,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_pp_stringify());
    }
 
-   if (  chunk_is_token(second, CT_POUND)
-      && second->flags.test(PCF_IN_PREPROC)
-      && get_chunk_parent_type(first) != CT_MACRO_FUNC)
+   if (  second->Is(CT_POUND)
+      && second->TestFlags(PCF_IN_PREPROC)
+      && first->GetParentType() != CT_MACRO_FUNC)
    {
       // Add or remove space before preprocessor '#' stringify operator
       // as in '#define x(y) L#y'.
@@ -206,54 +135,54 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_pp_stringify());
    }
 
-   if (  chunk_is_token(first, CT_SPACE)
-      || chunk_is_token(second, CT_SPACE))
+   if (  first->Is(CT_SPACE)
+      || second->Is(CT_SPACE))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_DECLSPEC))  // Issue 1289
+   if (first->Is(CT_DECLSPEC))  // Issue 1289
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (  chunk_is_token(second, CT_NEWLINE)
-      || chunk_is_token(second, CT_VBRACE_OPEN))
+   if (  second->Is(CT_NEWLINE)
+      || second->Is(CT_VBRACE_OPEN))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (  chunk_is_token(first, CT_VBRACE_OPEN)
-      && second->type != CT_NL_CONT
-      && second->type != CT_SEMICOLON) // # Issue 1158
+   if (  first->Is(CT_VBRACE_OPEN)
+      && second->IsNot(CT_NL_CONT)
+      && second->IsNot(CT_SEMICOLON)) // # Issue 1158
    {
       log_rule("FORCE");
       return(IARF_FORCE);
    }
 
-   if (  chunk_is_token(first, CT_VBRACE_CLOSE)
-      && second->type != CT_NL_CONT)
+   if (  first->Is(CT_VBRACE_CLOSE)
+      && second->IsNot(CT_NL_CONT))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(second, CT_VSEMICOLON))
+   if (second->Is(CT_VSEMICOLON))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_MACRO_FUNC))
+   if (first->Is(CT_MACRO_FUNC))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(second, CT_NL_CONT))
+   if (second->Is(CT_NL_CONT))
    {
       // Add or remove space before a backslash-newline at the end of a line.
       log_rule("sp_before_nl_cont");
@@ -261,17 +190,17 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_D)
-      && (  chunk_is_token(first, CT_D_ARRAY_COLON)
-         || chunk_is_token(second, CT_D_ARRAY_COLON)))
+      && (  first->Is(CT_D_ARRAY_COLON)
+         || second->Is(CT_D_ARRAY_COLON)))
    {
       // (D) Add or remove around the D named array initializer ':' operator.
       log_rule("sp_d_array_colon");
       return(options::sp_d_array_colon());
    }
 
-   if (  chunk_is_token(first, CT_CASE)
-      && ((  CharTable::IsKw1(second->str[0])
-          || chunk_is_token(second, CT_NUMBER))))
+   if (  first->Is(CT_CASE)
+      && ((  CharTable::IsKw1(second->GetStr()[0])
+          || second->Is(CT_NUMBER))))
    {
       // Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
       // sense here.
@@ -279,7 +208,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_case_label() | IARF_ADD);
    }
 
-   if (chunk_is_token(first, CT_FOR_COLON))
+   if (first->Is(CT_FOR_COLON))
    {
       // java
       // Add or remove space after ':' in a Java/C++11 range-based 'for',
@@ -288,7 +217,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_after_for_colon());
    }
 
-   if (chunk_is_token(second, CT_FOR_COLON))
+   if (second->Is(CT_FOR_COLON))
    {
       // java
       // Add or remove space before ':' in a Java/C++11 range-based 'for',
@@ -297,8 +226,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_for_colon());
    }
 
-   if (  chunk_is_token(first, CT_QUESTION)
-      && chunk_is_token(second, CT_COND_COLON))
+   if (  first->Is(CT_QUESTION)
+      && second->Is(CT_COND_COLON))
    {
       // In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
       // and ':'.
@@ -307,10 +236,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_cond_ternary_short());
    }
 
-   if (  chunk_is_token(first, CT_QUESTION)                  // see the tests cpp:34513-34516
-      || chunk_is_token(second, CT_QUESTION))
+   if (  first->Is(CT_QUESTION)                  // see the tests cpp:34513-34516
+      || second->Is(CT_QUESTION))
    {
-      if (  chunk_is_token(second, CT_QUESTION)
+      if (  second->Is(CT_QUESTION)
          && (options::sp_cond_question_before() != IARF_IGNORE))
       {
          // Add or remove space before the '?' in 'b ? t : f'.
@@ -319,7 +248,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_cond_question_before());
       }
 
-      if (  chunk_is_token(first, CT_QUESTION)
+      if (  first->Is(CT_QUESTION)
          && (options::sp_cond_question_after() != IARF_IGNORE))
       {
          // Add or remove space after the '?' in 'b ? t : f'.
@@ -331,10 +260,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_cond_question());
    }
 
-   if (  chunk_is_token(first, CT_COND_COLON)
-      || chunk_is_token(second, CT_COND_COLON))
+   if (  first->Is(CT_COND_COLON)
+      || second->Is(CT_COND_COLON))
    {
-      if (  chunk_is_token(second, CT_COND_COLON)
+      if (  second->Is(CT_COND_COLON)
          && (options::sp_cond_colon_before() != IARF_IGNORE))
       {
          // Add or remove space before the ':' in 'b ? t : f'.
@@ -343,7 +272,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_cond_colon_before());
       }
 
-      if (  chunk_is_token(first, CT_COND_COLON)
+      if (  first->Is(CT_COND_COLON)
          && (options::sp_cond_colon_after() != IARF_IGNORE))
       {
          // Add or remove space after the ':' in 'b ? t : f'.
@@ -352,30 +281,30 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_cond_colon_after());
       }
       // Issue #2596
-      // replace "if (chunk_is_token(first, CT_WORD) && chunk_is_token(second, CT_COND_COLON))"
+      // replace "if (first->Is(CT_WORD) && second->Is(CT_COND_COLON))"
       // Add or remove space around the ':' in 'b ? t : f'.
       log_rule("sp_cond_colon");
       return(options::sp_cond_colon());
    }
 
    if (  language_is_set(LANG_D)
-      && (  chunk_is_token(first, CT_RANGE)
-         || chunk_is_token(second, CT_RANGE)))
+      && (  first->Is(CT_RANGE)
+         || second->Is(CT_RANGE)))
    {
       // (D) Add or remove space around the D '..' operator.
       log_rule("sp_range");
       return(options::sp_range());
    }
 
-   if (  chunk_is_token(first, CT_COLON)
-      && get_chunk_parent_type(first) == CT_SQL_EXEC)
+   if (  first->Is(CT_COLON)
+      && first->GetParentType() == CT_SQL_EXEC)
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
    // Macro stuff can only return IGNORE, ADD, or FORCE
-   if (chunk_is_token(first, CT_MACRO))
+   if (first->Is(CT_MACRO))
    {
       // Add or remove space between a macro name and its definition.
       log_rule("sp_macro");
@@ -383,8 +312,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(arg | ((arg != IARF_IGNORE) ? IARF_ADD : IARF_IGNORE));
    }
 
-   if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_MACRO_FUNC)
+   if (  first->Is(CT_FPAREN_CLOSE)
+      && first->GetParentType() == CT_MACRO_FUNC)
    {
       // Add or remove space between a macro function ')' and its definition.
       log_rule("sp_macro_func");
@@ -392,12 +321,27 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(arg | ((arg != IARF_IGNORE) ? IARF_ADD : IARF_IGNORE));
    }
 
-   if (chunk_is_token(first, CT_PREPROC))
+   if (first->Is(CT_PREPROC))
+   {
+      // Remove spaces, unless we are ignoring. See indent_preproc()
+      log_rule("pp_space_after");
+
+      if (options::pp_space_after() == IARF_IGNORE)
+      {
+         log_rule("IGNORE");
+         return(IARF_IGNORE);
+      }
+      log_rule("REMOVE");
+      return(IARF_REMOVE);
+   }
+
+   if (second->Is(CT_PREPROC))
    {
       // Remove spaces, unless we are ignoring. See indent_preproc()
-      if (options::pp_space() == IARF_IGNORE)
+      log_rule("pp_indent");
+
+      if (options::pp_indent() == IARF_IGNORE)
       {
-         log_rule("pp_space");
          log_rule("IGNORE");
          return(IARF_IGNORE);
       }
@@ -405,18 +349,18 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(second, CT_SEMICOLON))                       // see the tests cpp:34517-34519
+   if (second->Is(CT_SEMICOLON))                       // see the tests cpp:34517-34519
    {
-      if (chunk_is_token(first, CT_VBRACE_OPEN))
+      if (first->Is(CT_VBRACE_OPEN))
       {
          // Add or remove space before ';'.
          log_rule("sp_before_semi");
          return(options::sp_before_semi());
       }
 
-      if (get_chunk_parent_type(second) == CT_FOR)
+      if (second->GetParentType() == CT_FOR)
       {
-         if (chunk_is_token(first, CT_SPAREN_OPEN))
+         if (first->Is(CT_SPAREN_OPEN))
          {
             // empty, e.g. for (;;)
             //                 ^ is first
@@ -426,7 +370,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
             return(options::sp_before_semi_for_empty());
          }
 
-         if (chunk_is_token(first, CT_SEMICOLON))
+         if (first->Is(CT_SEMICOLON))
          {
             // empty, e.g. for (;;)
             //                  ^ is first
@@ -439,11 +383,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          log_rule("sp_before_semi_for");
          return(options::sp_before_semi_for());
       }
-      iarf_e arg = options::sp_before_semi();                      // see the tests cpp:34517-34519
+      iarf_e arg = options::sp_before_semi();          // see the tests cpp:34517-34519
 
-      if (  chunk_is_token(first, CT_VBRACE_OPEN)                  // Issue #2942
-         && chunk_is_token(first->prev, CT_SPAREN_CLOSE)
-         && get_chunk_parent_type(first) != CT_WHILE_OF_DO)
+      if (  first->Is(CT_VBRACE_OPEN)                  // Issue #2942
+         && first->GetPrev()->Is(CT_SPAREN_CLOSE)
+         && first->GetParentType() != CT_WHILE_OF_DO)
       {
          // Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
          log_rule("sp_special_semi");
@@ -457,19 +401,19 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(arg);
    }
 
-   if (  (  chunk_is_token(second, CT_COMMENT)
-         || chunk_is_token(second, CT_COMMENT_CPP))
-      && (  chunk_is_token(first, CT_PP_ELSE)
-         || chunk_is_token(first, CT_PP_ENDIF)))
+   if (  (  second->Is(CT_COMMENT)
+         || second->Is(CT_COMMENT_CPP))
+      && (  first->Is(CT_PP_ELSE)
+         || first->Is(CT_PP_ENDIF)))
    {
-      set_chunk_type(second, CT_COMMENT_ENDIF);
+      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());
    }
 
    if (  options::sp_before_tr_cmt() != IARF_IGNORE
-      && get_chunk_parent_type(second) == CT_COMMENT_END)
+      && second->GetParentType() == CT_COMMENT_END)
    {
       // Add or remove space before a trailing comment.
       // Number of spaces before a trailing comment.
@@ -478,30 +422,30 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_tr_cmt());
    }
 
-   if (get_chunk_parent_type(second) == CT_COMMENT_END)
+   if (second->GetParentType() == CT_COMMENT_END)
    {
-      switch (second->orig_prev_sp)
+      switch (second->GetOrigPrevSp())
       {
       case 0:
-         log_rule("orig_prev_sp-REMOVE");
+         log_rule("orig prev sp - REMOVE");
          return(IARF_REMOVE);
 
       case 1:
-         log_rule("orig_prev_sp-FORCE");
+         log_rule("orig prev sp - FORCE");
          return(IARF_FORCE);
 
       default:
-         log_rule("orig_prev_sp-ADD");
+         log_rule("orig prev sp - ADD");
          return(IARF_ADD);
       }
    }
 
    // "for (;;)" vs. "for (;; )" and "for (a;b;c)" vs. "for (a; b; c)"
-   if (chunk_is_token(first, CT_SEMICOLON))                        // see the tests cpp:34517-34519
+   if (first->Is(CT_SEMICOLON))                        // see the tests cpp:34517-34519
    {
-      if (get_chunk_parent_type(first) == CT_FOR)
+      if (first->GetParentType() == CT_FOR)
       {
-         if (chunk_is_token(second, CT_SPAREN_CLOSE))
+         if (second->Is(CT_SPAREN_CLOSE))
          {
             // Add or remove space after the final semicolon of an empty part of a for
             // statement, as in 'for ( ; ; <here> )'.
@@ -509,7 +453,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
             return(options::sp_after_semi_for_empty());
          }
 
-         if (second->type != CT_SPAREN_CLOSE)  // Issue 1324
+         if (second->IsNot(CT_SPAREN_CLOSE))  // Issue 1324
          {
             // Add or remove space after ';' in non-empty 'for' statements.
             log_rule("sp_after_semi_for");
@@ -517,7 +461,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          }
       }
       else if (  !second->IsComment()
-              && second->type != CT_BRACE_CLOSE) // issue #197
+              && second->IsNot(CT_BRACE_CLOSE)) // issue #197
       {
          // Add or remove space after ';', except when followed by a comment.
          // see the tests cpp:34517-34519
@@ -528,31 +472,31 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // puts a space in the rare '+-' or '-+'
-   if (  (  chunk_is_token(first, CT_NEG)
-         || chunk_is_token(first, CT_POS)
-         || chunk_is_token(first, CT_ARITH)
-         || chunk_is_token(first, CT_SHIFT))
-      && (  chunk_is_token(second, CT_NEG)
-         || chunk_is_token(second, CT_POS)
-         || chunk_is_token(second, CT_ARITH)
-         || chunk_is_token(second, CT_SHIFT)))
+   if (  (  first->Is(CT_NEG)
+         || first->Is(CT_POS)
+         || first->Is(CT_ARITH)
+         || first->Is(CT_SHIFT))
+      && (  second->Is(CT_NEG)
+         || second->Is(CT_POS)
+         || second->Is(CT_ARITH)
+         || second->Is(CT_SHIFT)))
    {
       log_rule("ADD");
       return(IARF_ADD);
    }
 
    // "return(a);" vs. "return (foo_t)a + 3;" vs. "return a;" vs. "return;"
-   if (chunk_is_token(first, CT_RETURN))
+   if (first->Is(CT_RETURN))
    {
-      if (  chunk_is_token(second, CT_PAREN_OPEN)
-         && get_chunk_parent_type(second) == CT_RETURN)
+      if (  second->Is(CT_PAREN_OPEN)
+         && second->GetParentType() == CT_RETURN)
       {
          // Add or remove space between 'return' and '('.
          log_rule("sp_return_paren");
          return(options::sp_return_paren());
       }
-      else if (  chunk_is_token(second, CT_BRACE_OPEN)
-              && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
+      else if (  second->Is(CT_BRACE_OPEN)
+              && second->GetParentType() == CT_BRACED_INIT_LIST)
       {
          // Add or remove space between 'return' and '{'.
          log_rule("sp_return_brace");
@@ -570,16 +514,16 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "sizeof(foo_t)" vs. "sizeof (foo_t)"
-   if (chunk_is_token(first, CT_SIZEOF))
+   if (first->Is(CT_SIZEOF))
    {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
+      if (second->Is(CT_PAREN_OPEN))
       {
          // Add or remove space between 'sizeof' and '('.
          log_rule("sp_sizeof_paren");
          return(options::sp_sizeof_paren());
       }
 
-      if (chunk_is_token(second, CT_ELLIPSIS))
+      if (second->Is(CT_ELLIPSIS))
       {
          // Add or remove space between 'sizeof' and '...'.
          log_rule("sp_sizeof_ellipsis");
@@ -590,9 +534,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "decltype(foo_t)" vs. "decltype (foo_t)"
-   if (chunk_is_token(first, CT_DECLTYPE))
+   if (first->Is(CT_DECLTYPE))
    {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
+      if (second->Is(CT_PAREN_OPEN))
       {
          // Add or remove space between 'decltype' and '('.
          log_rule("sp_decltype_paren");
@@ -603,7 +547,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // handle '::'
-   if (chunk_is_token(first, CT_DC_MEMBER))
+   if (first->Is(CT_DC_MEMBER))
    {
       // Add or remove space after the '::' operator.
       log_rule("sp_after_dc");
@@ -612,21 +556,20 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    // Issue #889
    // mapped_file_source abc((int) ::CW2A(sTemp));
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && chunk_is_token(second, CT_DC_MEMBER)
-      && second->next != nullptr
-      && second->next->type == CT_FUNC_CALL)
+   if (  first->Is(CT_PAREN_CLOSE)
+      && second->Is(CT_DC_MEMBER)
+      && second->GetNext()->GetType() == CT_FUNC_CALL)
    {
       log_rule("sp_after_cast");
       return(options::sp_after_cast());
    }
 
-   if (chunk_is_token(second, CT_DC_MEMBER))
+   if (second->Is(CT_DC_MEMBER))
    {
       /* '::' at the start of an identifier is not member access, but global scope operator.
        * Detect if previous chunk is keyword
        */
-      switch (first->type)
+      switch (first->GetType())
       {
       case CT_SBOOL:
       case CT_SASSIGN:
@@ -659,10 +602,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          break;
       }
 
-      if (  (  chunk_is_token(first, CT_WORD)
-            || chunk_is_token(first, CT_TYPE)
-            || chunk_is_token(first, CT_PAREN_CLOSE)
-            || CharTable::IsKw1(first->str[0]))
+      if (  (  first->Is(CT_WORD)
+            || first->Is(CT_TYPE)
+            || first->Is(CT_PAREN_CLOSE)
+            || CharTable::IsKw1(first->GetStr()[0]))
          && (strcmp(first->Text(), "void") != 0)) // Issue 1249
       {
          // Add or remove space before the '::' operator.
@@ -672,21 +615,21 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "a,b" vs. "a, b"
-   if (chunk_is_token(first, CT_COMMA))                         // see the tests cpp:34520-34524
-                                                                // see the tests c-sharp:12200-12202
+   if (first->Is(CT_COMMA))                         // see the tests cpp:34520-34524
+   // see the tests c-sharp:12200-12202
    {
-      if (  language_is_set(LANG_CS)
-         && get_chunk_parent_type(first) == CT_TYPE)
+      if (  language_is_set(LANG_CS | LANG_VALA)
+         && first->GetParentType() == CT_TYPE)
       {
-         // C# multidimensional array type: ',,' vs. ', ,' or ',]' vs. ', ]'
-         if (chunk_is_token(second, CT_COMMA))
+         // (C#, Vala) multidimensional array type: ',,' vs. ', ,' or ',]' vs. ', ]'
+         if (second->Is(CT_COMMA))
          {
-            // (C#) Add or remove space between ',' in multidimensional array type
+            // (C#, Vala) Add or remove space between ',' in multidimensional array type
             // like 'int[,,]'.
             log_rule("sp_between_mdatype_commas");
             return(options::sp_between_mdatype_commas());
          }
-         // (C#) Add or remove space between ',' and ']' in multidimensional array type
+         // (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
          // like 'int[,,]'.
          log_rule("sp_after_mdatype_commas");
          return(options::sp_after_mdatype_commas());
@@ -694,7 +637,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
       // Fix for issue #1243
       // Don't add extra space after comma immediately followed by Angle close
-      if (chunk_is_token(second, CT_ANGLE_CLOSE))
+      if (second->Is(CT_ANGLE_CLOSE))
       {
          log_rule("IGNORE");
          return(IARF_IGNORE);
@@ -707,32 +650,31 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    // test if we are within a SIGNAL/SLOT call
    if (QT_SIGNAL_SLOT_found)
    {
-      if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-         && (  chunk_is_token(second, CT_FPAREN_CLOSE)
-            || chunk_is_token(second, CT_COMMA)))
+      if (  first->Is(CT_FPAREN_CLOSE)
+         && (  second->Is(CT_FPAREN_CLOSE)
+            || second->Is(CT_COMMA)))
       {
-         if (second->level == QT_SIGNAL_SLOT_level)
+         if (second->GetLevel() == QT_SIGNAL_SLOT_level)
          {
             restoreValues = true;
          }
       }
    }
 
-   if (chunk_is_token(second, CT_COMMA))
+   if (second->Is(CT_COMMA))
    {
-      if (  language_is_set(LANG_CS)
-         && chunk_is_token(first, CT_SQUARE_OPEN)
-         && get_chunk_parent_type(first) == CT_TYPE)
+      if (  language_is_set(LANG_CS | LANG_VALA)
+         && first->Is(CT_SQUARE_OPEN)
+         && first->GetParentType() == CT_TYPE)
       {
-         // Only for C#.
-         // (C#) Add or remove space between '[' and ',' in multidimensional array type
+         // (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
          // like 'int[,,]'.
          log_rule("sp_before_mdatype_commas");
          return(options::sp_before_mdatype_commas());
       }
 
-      if (  chunk_is_token(first, CT_PAREN_OPEN)
-         || chunk_is_token(first, CT_FPAREN_OPEN))
+      if (  first->Is(CT_PAREN_OPEN)
+         || first->Is(CT_FPAREN_OPEN))
       {
          // Add or remove space between an open parenthesis and comma,
          // i.e. '(,' vs. '( ,'.
@@ -744,19 +686,19 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_comma());
    }
 
-   if (chunk_is_token(second, CT_ELLIPSIS))
+   if (second->Is(CT_ELLIPSIS))
    {
       // type followed by a ellipsis
       Chunk *tmp = first;
 
-      if (  chunk_is_token(tmp, CT_PTR_TYPE)
-         || chunk_is_token(tmp, CT_BYREF))
+      if (  tmp->Is(CT_PTR_TYPE)
+         || tmp->Is(CT_BYREF))
       {
          tmp = tmp->GetPrevNcNnl();
       }
 
-      if (  chunk_is_token(tmp, CT_TYPE)
-         || chunk_is_token(tmp, CT_QUALIFIER))
+      if (  tmp->Is(CT_TYPE)
+         || tmp->Is(CT_QUALIFIER))
       {
          // Add or remove space between a type and '...'.
          log_rule("sp_type_ellipsis");
@@ -764,7 +706,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
 
       // non-punc followed by a ellipsis
-      if (  !first->flags.test(PCF_PUNCTUATOR)
+      if (  !first->TestFlags(PCF_PUNCTUATOR)
          && (options::sp_before_ellipsis() != IARF_IGNORE))
       {
          // Add or remove space before the variadic '...' when preceded by a
@@ -773,50 +715,49 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_before_ellipsis());
       }
 
-      if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-         || chunk_is_token(first, CT_PAREN_CLOSE))
+      if (  first->Is(CT_FPAREN_CLOSE)
+         || first->Is(CT_PAREN_CLOSE))
       {
          // Add or remove space between ')' and '...'.
          log_rule("sp_paren_ellipsis");
          return(options::sp_paren_ellipsis());
       }
 
-      if (chunk_is_token(first, CT_TAG_COLON))
+      if (first->Is(CT_TAG_COLON))
       {
          log_rule("FORCE");
          return(IARF_FORCE);
       }
 
-      if (chunk_is_token(first, CT_BYREF))                         // Issue #3309
+      if (first->Is(CT_BYREF))                         // Issue #3309
       {
          log_rule("sp_byref_ellipsis");
          return(options::sp_byref_ellipsis());
       }
 
-      if (chunk_is_token(first, CT_PARAMETER_PACK))                // Issue #3309
+      if (first->Is(CT_PARAMETER_PACK))                // Issue #3309
       {
          log_rule("sp_parameter_pack_ellipsis");
          return(options::sp_parameter_pack_ellipsis());
       }
    }
 
-   if (chunk_is_token(first, CT_ELLIPSIS))
+   if (first->Is(CT_ELLIPSIS))
    {
-      if (chunk_is_token(second, CT_PARAMETER_PACK))                // Issue #3309
+      if (second->Is(CT_PARAMETER_PACK))                // Issue #3309
       {
          log_rule("sp_ellipsis_parameter_pack");
          return(options::sp_ellipsis_parameter_pack());
       }
 
-      if (CharTable::IsKw1(second->str[0]))
+      if (CharTable::IsKw1(second->GetStr()[0]))
       {
          log_rule("FORCE");
          return(IARF_FORCE);
       }
 
-      if (  chunk_is_token(second, CT_PAREN_OPEN)
-         && first->prev != nullptr
-         && chunk_is_token(first->prev, CT_SIZEOF))
+      if (  second->Is(CT_PAREN_OPEN)
+         && first->GetPrev()->Is(CT_SIZEOF))
       {
          // Add or remove space between 'sizeof...' and '('.
          log_rule("sp_sizeof_ellipsis_paren");
@@ -825,29 +766,29 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_PAWN)
-      && chunk_is_token(first, CT_TAG_COLON))
+      && first->Is(CT_TAG_COLON))
    {
       // (Pawn) Add or remove space after the tag keyword.
       log_rule("sp_after_tag");
       return(options::sp_after_tag());
    }
 
-   if (chunk_is_token(second, CT_TAG_COLON))
+   if (second->Is(CT_TAG_COLON))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
    // handle '~'
-   if (chunk_is_token(first, CT_DESTRUCTOR))
+   if (first->Is(CT_DESTRUCTOR))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_CATCH)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
+      && first->Is(CT_CATCH)
+      && second->Is(CT_SPAREN_OPEN)
       && (options::sp_oc_catch_paren() != IARF_IGNORE))
    {
       // (OC) Add or remove space between '@catch' and '('
@@ -857,12 +798,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && (  chunk_is_token(first, CT_PAREN_CLOSE)
-         || chunk_is_token(first, CT_OC_CLASS)
-         || chunk_is_token(first, CT_WORD))
-      && chunk_is_token(second, CT_ANGLE_OPEN)
-      && (  get_chunk_parent_type(second) == CT_OC_PROTO_LIST
-         || get_chunk_parent_type(second) == CT_OC_GENERIC_SPEC)
+      && (  first->Is(CT_PAREN_CLOSE)
+         || first->Is(CT_OC_CLASS)
+         || first->Is(CT_WORD))
+      && second->Is(CT_ANGLE_OPEN)
+      && (  second->GetParentType() == CT_OC_PROTO_LIST
+         || second->GetParentType() == CT_OC_GENERIC_SPEC)
       && (options::sp_before_oc_proto_list() != IARF_IGNORE))
    {
       // (OC) Add or remove space before Objective-C protocol list
@@ -872,8 +813,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_OC_CLASS)
-      && chunk_is_token(second, CT_PAREN_OPEN)
+      && first->Is(CT_OC_CLASS)
+      && second->Is(CT_PAREN_OPEN)
       && (options::sp_oc_classname_paren() != IARF_IGNORE))
    {
       // (OC) Add or remove space between class name and '('
@@ -882,8 +823,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_oc_classname_paren());
    }
 
-   if (  chunk_is_token(first, CT_CATCH)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
+   if (  first->Is(CT_CATCH)
+      && second->Is(CT_SPAREN_OPEN)
       && (options::sp_catch_paren() != IARF_IGNORE))
    {
       // Add or remove space between 'catch' and '(' in 'catch (something) { }'.
@@ -893,8 +834,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_D)
-      && chunk_is_token(first, CT_D_VERSION_IF)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
+      && first->Is(CT_D_VERSION_IF)
+      && second->Is(CT_SPAREN_OPEN)
       && (options::sp_version_paren() != IARF_IGNORE))
    {
       // (D) Add or remove space between 'version' and '('
@@ -904,8 +845,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_D)
-      && chunk_is_token(first, CT_D_SCOPE_IF)
-      && chunk_is_token(second, CT_SPAREN_OPEN)
+      && first->Is(CT_D_SCOPE_IF)
+      && second->Is(CT_SPAREN_OPEN)
       && (options::sp_scope_paren() != IARF_IGNORE))
    {
       // (D) Add or remove space between 'scope' and '('
@@ -915,8 +856,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_SYNCHRONIZED)
-      && chunk_is_token(second, CT_SPAREN_OPEN))
+      && first->Is(CT_SYNCHRONIZED)
+      && second->Is(CT_SPAREN_OPEN))
    {
       // (OC) Add or remove space between '@synchronized' and the open parenthesis,
       // i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
@@ -925,10 +866,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "if (" vs. "if("
-   if (chunk_is_token(second, CT_SPAREN_OPEN))
+   if (second->Is(CT_SPAREN_OPEN))
    {
       // Add or remove space after 'do' between 'while' and '('. Issue #995
-      if (  chunk_is_token(first, CT_WHILE_OF_DO)
+      if (  first->Is(CT_WHILE_OF_DO)
          && options::sp_while_paren_open() != IARF_IGNORE)
       {
          log_rule("sp_while_paren_open");
@@ -940,8 +881,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_sparen());
    }
 
-   if (  chunk_is_token(first, CT_LAMBDA)
-      || chunk_is_token(second, CT_LAMBDA))
+   if (  first->Is(CT_LAMBDA)
+      || second->Is(CT_LAMBDA))
    {
       // Add or remove space around assignment operator '=', '+=', etc.
       log_rule("sp_assign (lambda)");
@@ -953,30 +894,30 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    // Add or remove space around '=' in C++11 lambda capture specifications.
    // Overrides sp_assign.
    if (  (options::sp_cpp_lambda_assign() != IARF_IGNORE)
-      && (  (  chunk_is_token(first, CT_SQUARE_OPEN)
-            && get_chunk_parent_type(first) == CT_CPP_LAMBDA
-            && chunk_is_token(second, CT_ASSIGN))
-         || (  chunk_is_token(first, CT_ASSIGN)
-            && chunk_is_token(second, CT_SQUARE_CLOSE)
-            && get_chunk_parent_type(second) == CT_CPP_LAMBDA)))
+      && (  (  first->Is(CT_SQUARE_OPEN)
+            && first->GetParentType() == CT_CPP_LAMBDA
+            && second->Is(CT_ASSIGN))
+         || (  first->Is(CT_ASSIGN)
+            && second->Is(CT_SQUARE_CLOSE)
+            && second->GetParentType() == CT_CPP_LAMBDA)))
    {
       log_rule("sp_cpp_lambda_assign");
       return(options::sp_cpp_lambda_assign());
    }
 
-   if (  chunk_is_token(first, CT_SQUARE_CLOSE)
-      && get_chunk_parent_type(first) == CT_CPP_LAMBDA)
+   if (  first->Is(CT_SQUARE_CLOSE)
+      && first->GetParentType() == CT_CPP_LAMBDA)
    {
       // Handle the special lambda case for C++11:
       //    [](Something arg){.....}
       // Add or remove space after the capture specification of a C++11 lambda when
       // an argument list is present, as in '[] <here> (int x){ ... }'.
-      if (chunk_is_token(second, CT_LPAREN_OPEN))
+      if (second->Is(CT_LPAREN_OPEN))
       {
          log_rule("sp_cpp_lambda_square_paren");
          return(options::sp_cpp_lambda_square_paren());
       }
-      else if (chunk_is_token(second, CT_BRACE_OPEN))
+      else if (second->Is(CT_BRACE_OPEN))
       {
          // Add or remove space after the capture specification of a C++11 lambda with
          // no argument list is present, as in '[] <here> { ... }'.
@@ -985,7 +926,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_LPAREN_OPEN))
+   if (first->Is(CT_LPAREN_OPEN))
    {
       // Add or remove space after the opening parenthesis of a argument list
       // of a C++11 lambda, as in '[]( <here> int x ){ ... }'.
@@ -993,9 +934,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_cpp_lambda_argument_list());
    }
 
-   if (chunk_is_token(first, CT_LPAREN_CLOSE))
+   if (first->Is(CT_LPAREN_CLOSE))
    {
-      if (chunk_is_token(second, CT_BRACE_OPEN))
+      if (second->Is(CT_BRACE_OPEN))
       {
          // Add or remove space after the argument list of a C++11 lambda, as in
          // '[](int x) <here> { ... }'.
@@ -1004,7 +945,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(second, CT_LPAREN_CLOSE))
+   if (second->Is(CT_LPAREN_CLOSE))
    {
       // Add or remove space before the closing parenthesis of a argument list
       // of a C++11 lambda, as in '[]( int x <here> ){ ... }'.
@@ -1012,9 +953,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_cpp_lambda_argument_list());
    }
 
-   if (  chunk_is_token(first, CT_BRACE_CLOSE)
-      && get_chunk_parent_type(first) == CT_CPP_LAMBDA
-      && chunk_is_token(second, CT_FPAREN_OPEN))
+   if (  first->Is(CT_BRACE_CLOSE)
+      && first->GetParentType() == CT_CPP_LAMBDA
+      && second->Is(CT_FPAREN_OPEN))
    {
       // Add or remove space between a lambda body and its call operator of an
       // immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
@@ -1022,15 +963,15 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_cpp_lambda_fparen());
    }
 
-   if (chunk_is_token(first, CT_ENUM))
+   if (first->Is(CT_ENUM))
    {
-      if (chunk_is_token(second, CT_BRACE_OPEN))
+      if (second->Is(CT_BRACE_OPEN))
       {
          // Add or remove space in 'enum {'.
          log_rule("sp_enum_brace");
          return(options::sp_enum_brace());
       }
-      else if (chunk_is_token(second, CT_FPAREN_OPEN))
+      else if (second->Is(CT_FPAREN_OPEN))
       {
          // Add or remove space in 'NS_ENUM ('.
          log_rule("sp_enum_paren");
@@ -1038,9 +979,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(second, CT_ASSIGN))
+   if (second->Is(CT_ASSIGN))
    {
-      if (second->flags.test(PCF_IN_ENUM))
+      if (second->TestFlags(PCF_IN_ENUM))
       {
          // Add or remove space before assignment '=' in enum.
          // Overrides sp_enum_assign.
@@ -1057,7 +998,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       // Add or remove space around assignment operator '=' in a prototype.
       // If set to ignore, use sp_assign.
       if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(second) == CT_FUNC_PROTO)
+         && second->GetParentType() == CT_FUNC_PROTO)
       {
          log_rule("sp_assign_default");
          return(options::sp_assign_default());
@@ -1075,12 +1016,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_assign());
    }
 
-   if (chunk_is_token(second, CT_ASSIGN_DEFAULT_ARG))
+   if (second->Is(CT_ASSIGN_DEFAULT_ARG))
    {
       // Add or remove space around assignment operator '=' in a prototype.
       // If set to ignore, use sp_assign.
       if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(second) == CT_FUNC_PROTO)
+         && second->GetParentType() == CT_FUNC_PROTO)
       {
          log_rule("sp_assign_default");
          return(options::sp_assign_default());
@@ -1098,9 +1039,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_assign());
    }
 
-   if (chunk_is_token(first, CT_ASSIGN))
+   if (first->Is(CT_ASSIGN))
    {
-      if (first->flags.test(PCF_IN_ENUM))
+      if (first->TestFlags(PCF_IN_ENUM))
       {
          // Add or remove space after assignment '=' in enum.
          // Overrides sp_enum_assign.
@@ -1117,7 +1058,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       // Add or remove space around assignment operator '=' in a prototype.
       // If set to ignore, use sp_assign.
       if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(first) == CT_FUNC_PROTO)
+         && first->GetParentType() == CT_FUNC_PROTO)
       {
          log_rule("sp_assign_default");
          return(options::sp_assign_default());
@@ -1135,22 +1076,22 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_assign());
    }
 
-   if (  chunk_is_token(first, CT_TRAILING_RET)
-      || chunk_is_token(first, CT_CPP_LAMBDA_RET)
-      || chunk_is_token(second, CT_TRAILING_RET)
-      || chunk_is_token(second, CT_CPP_LAMBDA_RET))
+   if (  first->Is(CT_TRAILING_RET)
+      || first->Is(CT_CPP_LAMBDA_RET)
+      || second->Is(CT_TRAILING_RET)
+      || second->Is(CT_CPP_LAMBDA_RET))
    {
       // Add or remove space around trailing return operator '->'.
       log_rule("sp_trailing_return");
       return(options::sp_trailing_return());
    }
 
-   if (chunk_is_token(first, CT_ASSIGN_DEFAULT_ARG))
+   if (first->Is(CT_ASSIGN_DEFAULT_ARG))
    {
       // Add or remove space around assignment operator '=' in a prototype.
       // If set to ignore, use sp_assign.
       if (  (options::sp_assign_default() != IARF_IGNORE)
-         && get_chunk_parent_type(first) == CT_FUNC_PROTO)
+         && first->GetParentType() == CT_FUNC_PROTO)
       {
          log_rule("sp_assign_default");
          return(options::sp_assign_default());
@@ -1168,10 +1109,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_assign());
    }
 
-   if (chunk_is_token(first, CT_BIT_COLON))
+   if (first->Is(CT_BIT_COLON))
    {
-      if (  first->flags.test(PCF_IN_ENUM)
-         || first->parent_type == CT_ENUM)
+      if (  first->TestFlags(PCF_IN_ENUM)
+         || first->GetParentType() == CT_ENUM)
       {
          // Add or remove space around assignment ':' in enum.
          log_rule("sp_enum_colon");
@@ -1179,10 +1120,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(second, CT_BIT_COLON))
+   if (second->Is(CT_BIT_COLON))
    {
-      if (  second->flags.test(PCF_IN_ENUM)
-         || second->parent_type == CT_ENUM)
+      if (  second->TestFlags(PCF_IN_ENUM)
+         || second->GetParentType() == CT_ENUM)
       {
          // Add or remove space around assignment ':' in enum.
          log_rule("sp_enum_colon");
@@ -1190,8 +1131,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(first, CT_OC_AVAILABLE_VALUE)
-      || chunk_is_token(second, CT_OC_AVAILABLE_VALUE))
+   if (  first->Is(CT_OC_AVAILABLE_VALUE)
+      || second->Is(CT_OC_AVAILABLE_VALUE))
    {
       log_rule("IGNORE");
       return(IARF_IGNORE);
@@ -1199,7 +1140,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    if (language_is_set(LANG_OC))
    {
-      if (chunk_is_token(second, CT_OC_BLOCK_CARET))
+      if (second->Is(CT_OC_BLOCK_CARET))
       {
          // (OC) Add or remove space before a block pointer caret,
          // i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
@@ -1207,7 +1148,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_before_oc_block_caret());
       }
 
-      if (chunk_is_token(first, CT_OC_BLOCK_CARET))
+      if (first->Is(CT_OC_BLOCK_CARET))
       {
          // (OC) Add or remove space after a block pointer caret,
          // i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
@@ -1215,12 +1156,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_after_oc_block_caret());
       }
 
-      if (chunk_is_token(second, CT_OC_MSG_FUNC))
+      if (second->Is(CT_OC_MSG_FUNC))
       {
          if (  (options::sp_after_oc_msg_receiver() == IARF_REMOVE)
-            && (  (first->type != CT_SQUARE_CLOSE)
-               && (first->type != CT_FPAREN_CLOSE)
-               && (first->type != CT_PAREN_CLOSE)))
+            && (  first->IsNot(CT_SQUARE_CLOSE)
+               && first->IsNot(CT_FPAREN_CLOSE)
+               && first->IsNot(CT_PAREN_CLOSE)))
          {
             log_rule("FORCE");
             return(IARF_FORCE);
@@ -1234,12 +1175,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    // c++17 structured bindings e.g., "auto [x, y, z]" vs. a[x, y, z]" or "auto const [x, y, z]" vs. "auto const[x, y, z]"
    if (  language_is_set(LANG_CPP)
-      && (  chunk_is_token(first, CT_BYREF)
-         || chunk_is_token(first, CT_QUALIFIER)
-         || chunk_is_token(first, CT_TYPE))
-      && chunk_is_token(second, CT_SQUARE_OPEN)
-      && get_chunk_parent_type(second) != CT_OC_MSG
-      && get_chunk_parent_type(second) != CT_CS_SQ_STMT)
+      && (  first->Is(CT_BYREF)
+         || first->Is(CT_QUALIFIER)
+         || first->Is(CT_TYPE))
+      && second->Is(CT_SQUARE_OPEN)
+      && second->GetParentType() != CT_OC_MSG
+      && second->GetParentType() != CT_CS_SQ_STMT)
    {
       // Add or remove space before C++17 structured bindings.
       log_rule("sp_cpp_before_struct_binding");
@@ -1247,26 +1188,26 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "a [x]" vs. "a[x]"
-   if (  chunk_is_token(second, CT_SQUARE_OPEN)
-      && (  get_chunk_parent_type(second) != CT_OC_MSG
-         && get_chunk_parent_type(second) != CT_CS_SQ_STMT
-         && get_chunk_parent_type(second) != CT_CPP_LAMBDA))
+   if (  second->Is(CT_SQUARE_OPEN)
+      && (  second->GetParentType() != CT_OC_MSG
+         && second->GetParentType() != CT_CS_SQ_STMT
+         && second->GetParentType() != CT_CPP_LAMBDA))
    {
-      if (  second->flags.test(PCF_IN_SPAREN)
-         && (chunk_is_token(first, CT_IN)))
+      if (  second->TestFlags(PCF_IN_SPAREN)
+         && (first->Is(CT_IN)))
       {
          log_rule("FORCE");
          return(IARF_FORCE);
       }
 
-      if (chunk_is_token(first, CT_ASM_COLON))
+      if (first->Is(CT_ASM_COLON))
       {
          // Add or remove space before '[' for asm block.
          log_rule("sp_before_square_asm_block");
          return(options::sp_before_square_asm_block());
       }
 
-      if (first->flags.test(PCF_VAR_DEF))
+      if (first->TestFlags(PCF_VAR_DEF))
       {
          // Add or remove space before '[' for a variable definition.
          log_rule("sp_before_vardef_square");
@@ -1278,7 +1219,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "byte[]" vs. "byte []"
-   if (chunk_is_token(second, CT_TSQUARE))
+   if (second->Is(CT_TSQUARE))
    {
       // Add or remove space before '[]'.
       log_rule("sp_before_squares");
@@ -1286,8 +1227,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  (options::sp_angle_shift() != IARF_IGNORE)
-      && chunk_is_token(first, CT_ANGLE_CLOSE)
-      && chunk_is_token(second, CT_ANGLE_CLOSE))
+      && first->Is(CT_ANGLE_CLOSE)
+      && second->Is(CT_ANGLE_CLOSE))
    {
       // Add or remove space between '>' and '>' in '>>' (template stuff).
       log_rule("sp_angle_shift");
@@ -1295,11 +1236,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // spacing around template < > stuff
-   if (  chunk_is_token(first, CT_ANGLE_OPEN)
-      || chunk_is_token(second, CT_ANGLE_CLOSE))
+   if (  first->Is(CT_ANGLE_OPEN)
+      || second->Is(CT_ANGLE_CLOSE))
    {
-      if (  chunk_is_token(first, CT_ANGLE_OPEN)
-         && chunk_is_token(second, CT_ANGLE_CLOSE))
+      if (  first->Is(CT_ANGLE_OPEN)
+         && second->Is(CT_ANGLE_CLOSE))
       {
          // Add or remove space inside '<>'.
          log_rule("sp_inside_angle_empty");
@@ -1312,17 +1253,17 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       // special: if we're not supporting digraphs, then we shouldn't create them!
       if (  (op == IARF_REMOVE)
          && !options::enable_digraphs()
-         && chunk_is_token(first, CT_ANGLE_OPEN)
-         && chunk_is_token(second, CT_DC_MEMBER))
+         && first->Is(CT_ANGLE_OPEN)
+         && second->Is(CT_DC_MEMBER))
       {
          op = IARF_IGNORE;
       }
       return(op);
    }
 
-   if (chunk_is_token(second, CT_ANGLE_OPEN))
+   if (second->Is(CT_ANGLE_OPEN))
    {
-      if (  chunk_is_token(first, CT_TEMPLATE)
+      if (  first->Is(CT_TEMPLATE)
          && (options::sp_template_angle() != IARF_IGNORE))
       {
          // Add or remove space between 'template' and '<'.
@@ -1331,7 +1272,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_template_angle());
       }
 
-      if (first->type != CT_QUALIFIER)
+      if (first->IsNot(CT_QUALIFIER))
       {
          // Add or remove space before '<'.
          log_rule("sp_before_angle");
@@ -1339,10 +1280,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_ANGLE_CLOSE))
+   if (first->Is(CT_ANGLE_CLOSE))
    {
-      if (  chunk_is_token(second, CT_WORD)
-         || CharTable::IsKw1(second->str[0]))
+      if (  second->Is(CT_WORD)
+         || CharTable::IsKw1(second->GetStr()[0]))
       {
          // Add or remove space between '>' and a word as in 'List<byte> m;' or
          // 'template <typename T> static ...'.
@@ -1350,12 +1291,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_angle_word());
       }
 
-      if (  chunk_is_token(second, CT_FPAREN_OPEN)
-         || chunk_is_token(second, CT_PAREN_OPEN))
+      if (  second->Is(CT_FPAREN_OPEN)
+         || second->Is(CT_PAREN_OPEN))
       {
          Chunk *next = second->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
+         if (next->Is(CT_FPAREN_CLOSE))
          {
             // Add or remove space between '>' and '()' as found in 'new List<byte>();'.
             log_rule("sp_angle_paren_empty");
@@ -1366,19 +1307,19 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_angle_paren());
       }
 
-      if (chunk_is_token(second, CT_DC_MEMBER))
+      if (second->Is(CT_DC_MEMBER))
       {
          // Add or remove space before the '::' operator.
          log_rule("sp_before_dc");
          return(options::sp_before_dc());
       }
 
-      if (  second->type != CT_BYREF
-         && second->type != CT_PTR_TYPE
-         && second->type != CT_BRACE_OPEN
-         && second->type != CT_PAREN_CLOSE)
+      if (  second->IsNot(CT_BYREF)
+         && second->IsNot(CT_PTR_TYPE)
+         && second->IsNot(CT_BRACE_OPEN)
+         && second->IsNot(CT_PAREN_CLOSE))
       {
-         if (  chunk_is_token(second, CT_CLASS_COLON)
+         if (  second->Is(CT_CLASS_COLON)
             && options::sp_angle_colon() != IARF_IGNORE)
          {
             // Add or remove space between '>' and ':'.
@@ -1389,7 +1330,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          // Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
          // historic behavior, but is probably not the desired behavior, so this is off
          // by default.
-         if (  chunk_is_token(second, CT_FPAREN_CLOSE)
+         if (  second->Is(CT_FPAREN_CLOSE)
             && options::sp_inside_fparen() != IARF_IGNORE
             && !options::use_sp_after_angle_always())
          {
@@ -1403,27 +1344,27 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_BYREF))                             // see the tests cpp:34509-34512
+   if (first->Is(CT_BYREF))                             // see the tests cpp:34509-34512
    {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
+      if (second->Is(CT_PAREN_OPEN))
       {
          // Add or remove space after a reference sign '&', if followed by an open
          // parenthesis, as in 'char& (*)()'.
          log_rule("sp_byref_paren");
          return(options::sp_byref_paren());
       }
-      else if (  get_chunk_parent_type(first) == CT_FUNC_DEF        // Issue #3197, #3210
-              || get_chunk_parent_type(first) == CT_FUNC_PROTO)
+      else if (  first->GetParentType() == CT_FUNC_DEF        // Issue #3197, #3210
+              || first->GetParentType() == CT_FUNC_PROTO)
       {
          // Add or remove space after a reference sign '&', if followed by a function
          // prototype or function definition.
          log_rule("sp_after_byref_func");                          // byref 2
          return(options::sp_after_byref_func());
       }
-      else if (  CharTable::IsKw1(second->str[0])
+      else if (  CharTable::IsKw1(second->GetStr()[0])
               && (  options::sp_after_byref() != IARF_IGNORE
-                 || (  !chunk_is_token(second, CT_FUNC_PROTO)
-                    && !chunk_is_token(second, CT_FUNC_DEF))))
+                 || (  !second->Is(CT_FUNC_PROTO)
+                    && !second->Is(CT_FUNC_DEF))))
       {
          // Add or remove space after reference sign '&', if followed by a word.
          log_rule("sp_after_byref");                               // byref 1
@@ -1431,11 +1372,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(second, CT_BYREF)
-      && !chunk_is_token(first, CT_PAREN_OPEN))              // Issue #1804
+   if (  second->Is(CT_BYREF)
+      && !first->Is(CT_PAREN_OPEN))              // Issue #1804
    {
-      if (  get_chunk_parent_type(second) == CT_FUNC_DEF     // Issue #3197, #3210
-         || get_chunk_parent_type(second) == CT_FUNC_PROTO)
+      if (  second->GetParentType() == CT_FUNC_DEF     // Issue #3197, #3210
+         || second->GetParentType() == CT_FUNC_PROTO)
       {
          // Add or remove space before a reference sign '&', if followed by a function
          // prototype or function definition.
@@ -1445,11 +1386,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       Chunk *next = second->GetNext();
 
       if (  next->IsNotNullChunk()
-         && (  chunk_is_token(next, CT_COMMA)
-            || chunk_is_token(next, CT_FPAREN_CLOSE)
-            || chunk_is_token(next, CT_SEMICOLON)))
+         && (  next->Is(CT_COMMA)
+            || next->Is(CT_PAREN_CLOSE)                            // Issue #3691
+            || next->Is(CT_FPAREN_CLOSE)
+            || next->Is(CT_SEMICOLON)))
       {
-         if (options::sp_before_unnamed_byref() != IARF_IGNORE)
+         if (options::sp_before_unnamed_byref() != IARF_IGNORE)    // Issue #3691
          {
             // Add or remove space before a reference sign '&' that isn't followed by a
             // variable name. If set to 'ignore', sp_before_byref is used instead.
@@ -1468,11 +1410,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_byref());
    }
 
-   if (chunk_is_token(first, CT_SPAREN_CLOSE))
+   if (first->Is(CT_SPAREN_CLOSE))
    {
-      if (chunk_is_token(second, CT_BRACE_OPEN))
+      if (second->Is(CT_BRACE_OPEN))
       {
-         if (get_chunk_parent_type(second) == CT_CATCH)
+         if (second->GetParentType() == CT_CATCH)
          {
             if (  language_is_set(LANG_OC)
                && (options::sp_oc_catch_brace() != IARF_IGNORE))
@@ -1511,16 +1453,16 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(second, CT_FPAREN_OPEN)
-      && get_chunk_parent_type(first) == CT_OPERATOR
+   if (  second->Is(CT_FPAREN_OPEN)
+      && first->GetParentType() == CT_OPERATOR
       && (options::sp_after_operator_sym() != IARF_IGNORE))
    {
       if (  (options::sp_after_operator_sym_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
+         && second->Is(CT_FPAREN_OPEN))
       {
          Chunk *next = second->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
+         if (next->Is(CT_FPAREN_CLOSE))
          {
             // Overrides sp_after_operator_sym when the operator has no arguments, as in
             // 'operator *()'.
@@ -1537,10 +1479,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    // Issue #2270
    // Translations under vala
    if (  language_is_set(LANG_VALA)
-      && chunk_is_token(first, CT_FUNC_CALL))
+      && first->Is(CT_FUNC_CALL))
    {
-      if (  chunk_is_str(first, "_")
-         && chunk_is_token(second, CT_FPAREN_OPEN)
+      if (  first->IsString("_")
+         && second->Is(CT_FPAREN_OPEN)
          && (options::sp_vala_after_translation() != IARF_IGNORE))
       {
          // Add or remove space after '_'.
@@ -1549,11 +1491,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(first, CT_MACRO_OPEN)
-      || chunk_is_token(first, CT_MACRO_CLOSE)
-      || chunk_is_token(first, CT_MACRO_ELSE))
+   if (  first->Is(CT_MACRO_OPEN)
+      || first->Is(CT_MACRO_CLOSE)
+      || first->Is(CT_MACRO_ELSE))
    {
-      if (chunk_is_token(second, CT_FPAREN_OPEN))
+      if (second->Is(CT_FPAREN_OPEN))
       {
          // TODO: provide some test data to check this block
          // Add or remove space between function name and '(' on function calls.
@@ -1565,21 +1507,23 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // spaces between function and open paren
-   if (  chunk_is_token(first, CT_FUNC_CALL)
-      || chunk_is_token(first, CT_FUNCTION)                        // Issue #2665
-      || chunk_is_token(first, CT_FUNC_CTOR_VAR)
-      || chunk_is_token(first, CT_CNG_HASINC)
-      || chunk_is_token(first, CT_CNG_HASINCN)
-      || (  chunk_is_token(first, CT_BRACE_CLOSE)
-         && first->parent_type == CT_BRACED_INIT_LIST
-         && chunk_is_token(second, CT_FPAREN_OPEN)))
+   if (  first->Is(CT_FUNC_CALL)
+      || first->Is(CT_FUNCTION)                        // Issue #2665
+      || first->Is(CT_FUNC_CTOR_VAR)
+      || first->Is(CT_CNG_HASINC)
+      || first->Is(CT_CNG_HASINCN)
+      || (  first->Is(CT_BRACE_CLOSE)
+         && first->GetParentType() == CT_BRACED_INIT_LIST
+         && second->Is(CT_FPAREN_OPEN))
+      || (  first->Is(CT_FUNC_VAR)                     // Issue #3852
+         && second->Is(CT_PAREN_OPEN)))
    {
       if (  (options::sp_func_call_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
+         && second->Is(CT_FPAREN_OPEN))
       {
          Chunk *next = second->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
+         if (next->Is(CT_FPAREN_CLOSE))
          {
             // Add or remove space between function name and '()' on function calls without
             // parameters. If set to 'ignore' (the default), sp_func_call_paren is used.
@@ -1592,7 +1536,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_func_call_paren());
    }
 
-   if (chunk_is_token(first, CT_FUNC_CALL_USER))
+   if (first->Is(CT_FUNC_CALL_USER))
    {
       // Add or remove space between the user function name and '(' on function
       // calls. You need to set a keyword to be a user function in the config file,
@@ -1602,22 +1546,22 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_func_call_user_paren());
    }
 
-   if (  chunk_is_token(first, CT_ATTRIBUTE)
-      && chunk_is_paren_open(second))
+   if (  first->Is(CT_ATTRIBUTE)
+      && second->IsParenOpen())
    {
       // Add or remove space between '__attribute__' and '('.
       log_rule("sp_attribute_paren");
       return(options::sp_attribute_paren());
    }
 
-   if (chunk_is_token(first, CT_FUNC_DEF))
+   if (first->Is(CT_FUNC_DEF))
    {
       if (  (options::sp_func_def_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
+         && second->Is(CT_FPAREN_OPEN))
       {
          Chunk *next = second->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
+         if (next->Is(CT_FPAREN_CLOSE))
          {
             // Add or remove space between function name and '()' on function definition
             // without parameters.
@@ -1630,8 +1574,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_func_def_paren());
    }
 
-   if (  chunk_is_token(first, CT_CPP_CAST)
-      || chunk_is_token(first, CT_TYPE_WRAP))
+   if (  first->Is(CT_CPP_CAST)
+      || first->Is(CT_TYPE_WRAP))
    {
       // Add or remove space between the type and open parenthesis in a C++ cast,
       // i.e. 'int(exp)' vs. 'int (exp)'.
@@ -1639,21 +1583,21 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_cpp_cast_paren());
    }
 
-   if (  chunk_is_token(first, CT_SPAREN_CLOSE)
-      && chunk_is_token(second, CT_WHEN))
+   if (  first->Is(CT_SPAREN_CLOSE)
+      && second->Is(CT_WHEN))
    {
       // TODO: provide some test data to check this block
       log_rule("FORCE");
       return(IARF_FORCE); // TODO: make this configurable?
    }
 
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && (  chunk_is_token(second, CT_PAREN_OPEN)
-         || chunk_is_token(second, CT_FPAREN_OPEN)))
+   if (  first->Is(CT_PAREN_CLOSE)
+      && (  second->Is(CT_PAREN_OPEN)
+         || second->Is(CT_FPAREN_OPEN)))
    {
       // "(int)a" vs. "(int) a" or "cast(int)a" vs. "cast(int) a"
-      if (  get_chunk_parent_type(first) == CT_C_CAST
-         || get_chunk_parent_type(first) == CT_D_CAST)
+      if (  first->GetParentType() == CT_C_CAST
+         || first->GetParentType() == CT_D_CAST)
       {
          // Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
          // '(int)a' vs. '(int) a'.
@@ -1666,7 +1610,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // handle the space between parens in fcn type 'void (*f)(void)'
-   if (chunk_is_token(first, CT_TPAREN_CLOSE))
+   if (first->Is(CT_TPAREN_CLOSE))
    {
       // Add or remove space between the ')' and '(' in a function type, as in
       // 'void (*x)(...)'.
@@ -1675,26 +1619,26 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // ")(" vs. ") ("
-   if (  (  chunk_is_str(first, ")")
-         && chunk_is_str(second, "("))
-      || (  chunk_is_paren_close(first)
-         && chunk_is_paren_open(second)))
+   if (  (  first->IsString(")")
+         && second->IsString("("))
+      || (  first->IsParenClose()
+         && second->IsParenOpen()))
    {
       // Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
       log_rule("sp_cparen_oparen");
       return(options::sp_cparen_oparen());
    }
 
-   if (  chunk_is_token(first, CT_FUNC_PROTO)
-      || (  chunk_is_token(second, CT_FPAREN_OPEN)
-         && get_chunk_parent_type(second) == CT_FUNC_PROTO))
+   if (  first->Is(CT_FUNC_PROTO)
+      || (  second->Is(CT_FPAREN_OPEN)
+         && second->GetParentType() == CT_FUNC_PROTO))
    {
       if (  (options::sp_func_proto_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
+         && second->Is(CT_FPAREN_OPEN))
       {
          Chunk *next = second->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
+         if (next->Is(CT_FPAREN_CLOSE))
          {
             // Add or remove space between function name and '()' on function declaration
             // without parameters.
@@ -1708,23 +1652,23 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // Issue #2437
-   if (  chunk_is_token(first, CT_FUNC_TYPE)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
+   if (  first->Is(CT_FUNC_TYPE)
+      && second->Is(CT_FPAREN_OPEN))
    {
       // Add or remove space between function name and '(' with a typedef specifier.
       log_rule("sp_func_type_paren");
       return(options::sp_func_type_paren());
    }
 
-   if (  chunk_is_token(first, CT_FUNC_CLASS_DEF)
-      || chunk_is_token(first, CT_FUNC_CLASS_PROTO))
+   if (  first->Is(CT_FUNC_CLASS_DEF)
+      || first->Is(CT_FUNC_CLASS_PROTO))
    {
       if (  (options::sp_func_class_paren_empty() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
+         && second->Is(CT_FPAREN_OPEN))
       {
          Chunk *next = second->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_FPAREN_CLOSE))
+         if (next->Is(CT_FPAREN_CLOSE))
          {
             // Add or remove space between a constructor without parameters or destructor
             // and '()'.
@@ -1738,30 +1682,30 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_func_class_paren());
    }
 
-   if (  chunk_is_token(first, CT_CLASS)
-      && !first->flags.test(PCF_IN_OC_MSG))
+   if (  first->Is(CT_CLASS)
+      && !first->TestFlags(PCF_IN_OC_MSG))
    {
       log_rule("FORCE");
       return(IARF_FORCE);
    }
 
-   if (  chunk_is_token(first, CT_BRACE_OPEN)
-      && chunk_is_token(second, CT_BRACE_CLOSE))
+   if (  first->Is(CT_BRACE_OPEN)
+      && second->Is(CT_BRACE_CLOSE))
    {
       // Add or remove space inside '{}'.
       log_rule("sp_inside_braces_empty");
       return(options::sp_inside_braces_empty());
    }
 
-   if (  (  chunk_is_token(first, CT_TYPE)                           // Issue #2428
-         || chunk_is_token(first, CT_ANGLE_CLOSE))
-      && chunk_is_token(second, CT_BRACE_OPEN)
-      && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
+   if (  (  first->Is(CT_TYPE)                           // Issue #2428
+         || first->Is(CT_ANGLE_CLOSE))
+      && second->Is(CT_BRACE_OPEN)
+      && second->GetParentType() == CT_BRACED_INIT_LIST)
    {
       iarf_flags_t arg = iarf_flags_t{ options::sp_type_brace_init_lst() };
 
       if (  arg != IARF_IGNORE
-         || get_chunk_parent_type(first) != CT_DECLTYPE)
+         || first->GetParentType() != CT_DECLTYPE)
       {
          // 'int{9}' vs. 'int {9}'
          // Add or remove space between type and open brace of an unnamed temporary
@@ -1771,18 +1715,18 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  (  chunk_is_token(first, CT_WORD)                           // Issue #2428
-         || chunk_is_token(first, CT_SQUARE_CLOSE)
-         || chunk_is_token(first, CT_TSQUARE))
-      && chunk_is_token(second, CT_BRACE_OPEN)
-      && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
+   if (  (  first->Is(CT_WORD)                           // Issue #2428
+         || first->Is(CT_SQUARE_CLOSE)
+         || first->Is(CT_TSQUARE))
+      && second->Is(CT_BRACE_OPEN)
+      && second->GetParentType() == CT_BRACED_INIT_LIST)
    {
       // Add or remove space between a variable and '{' for C++ uniform
       // initialization.
       auto arg = iarf_flags_t{ options::sp_word_brace_init_lst() };
 
       if (  arg != IARF_IGNORE
-         || get_chunk_parent_type(first) != CT_DECLTYPE)
+         || first->GetParentType() != CT_DECLTYPE)
       {
          // 'a{9}' vs. 'a {9}'
          // Add or remove space between variable/word and open brace of an unnamed
@@ -1792,22 +1736,22 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(second, CT_BRACE_CLOSE))
+   if (second->Is(CT_BRACE_CLOSE))
    {
-      if (get_chunk_parent_type(second) == CT_ENUM)
+      if (second->GetParentType() == CT_ENUM)
       {
          // Add or remove space inside enum '{' and '}'.
          log_rule("sp_inside_braces_enum");
          return(options::sp_inside_braces_enum());
       }
 
-      if (  get_chunk_parent_type(second) == CT_STRUCT
-         || get_chunk_parent_type(second) == CT_UNION)
+      if (  second->GetParentType() == CT_STRUCT
+         || second->GetParentType() == CT_UNION)
       {
          // Fix for issue #1240  adding space in struct initializers
-         Chunk *tmp = chunk_skip_to_match_rev(second)->GetPrevNcNnl();
+         Chunk *tmp = second->GetOpeningParen()->GetPrevNcNnl();
 
-         if (chunk_is_token(tmp, CT_ASSIGN))
+         if (tmp->Is(CT_ASSIGN))
          {
             // TODO: provide some test data to check this block
             log_rule("IGNORE");
@@ -1818,7 +1762,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_inside_braces_struct());
       }
       else if (  language_is_set(LANG_OC)
-              && get_chunk_parent_type(second) == CT_OC_AT
+              && second->GetParentType() == CT_OC_AT
               && options::sp_inside_braces_oc_dict() != IARF_IGNORE)
       {
          // (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
@@ -1826,13 +1770,13 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_inside_braces_oc_dict());
       }
 
-      if (get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
+      if (second->GetParentType() == CT_BRACED_INIT_LIST)
       {
          // Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
          // only to help the vim command }}}}
          if (  options::sp_brace_brace() != IARF_IGNORE
-            && chunk_is_token(first, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(first) == CT_BRACED_INIT_LIST)
+            && first->Is(CT_BRACE_CLOSE)
+            && first->GetParentType() == CT_BRACED_INIT_LIST)
          {
             log_rule("sp_brace_brace");
             return(options::sp_brace_brace());
@@ -1863,23 +1807,23 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_inside_braces());
    }
 
-   if (chunk_is_token(first, CT_D_CAST))
+   if (first->Is(CT_D_CAST))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (  chunk_is_token(first, CT_PP_DEFINED)
-      && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  first->Is(CT_PP_DEFINED)
+      && second->Is(CT_PAREN_OPEN))
    {
       // Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
       log_rule("sp_defined_paren");
       return(options::sp_defined_paren());
    }
 
-   if (chunk_is_token(first, CT_THROW))
+   if (first->Is(CT_THROW))
    {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
+      if (second->Is(CT_PAREN_OPEN))
       {
          // Add or remove space between 'throw' and '(' in 'throw (something)'.
          log_rule("sp_throw_paren");
@@ -1891,56 +1835,56 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_after_throw());
    }
 
-   if (  chunk_is_token(first, CT_THIS)
-      && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  first->Is(CT_THIS)
+      && second->Is(CT_PAREN_OPEN))
    {
       // Add or remove space between 'this' and '(' in 'this (something)'.
       log_rule("sp_this_paren");
       return(options::sp_this_paren());
    }
 
-   if (  chunk_is_token(first, CT_STATE)
-      && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  first->Is(CT_STATE)
+      && second->Is(CT_PAREN_OPEN))
    {
       log_rule("ADD");
       return(IARF_ADD);
    }
 
-   if (  chunk_is_token(first, CT_DELEGATE)
-      && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  first->Is(CT_DELEGATE)
+      && second->Is(CT_PAREN_OPEN))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (  chunk_is_token(first, CT_MEMBER)
-      || chunk_is_token(second, CT_MEMBER))
+   if (  first->Is(CT_MEMBER)
+      || second->Is(CT_MEMBER))
    {
       // Add or remove space around the '.' or '->' operators.
       log_rule("sp_member");
       return(options::sp_member());
    }
 
-   if (chunk_is_token(first, CT_C99_MEMBER))
+   if (first->Is(CT_C99_MEMBER))
    {
       // always remove space(s) after then '.' of a C99-member
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (  chunk_is_token(first, CT_SUPER)
-      && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  first->Is(CT_SUPER)
+      && second->Is(CT_PAREN_OPEN))
    {
       // Add or remove space between 'super' and '(' in 'super (something)'.
       log_rule("sp_super_paren");
       return(options::sp_super_paren());
    }
 
-   if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_FPAREN_CLOSE)
+      && second->Is(CT_BRACE_OPEN))
    {
       if (  language_is_set(LANG_JAVA)
-         && get_chunk_parent_type(second) == CT_DOUBLE_BRACE)
+         && second->GetParentType() == CT_DOUBLE_BRACE)
       {
          // (Java) Add or remove space between ')' and '{{' of double brace initializer.
          // only to help the vim command }}
@@ -1950,12 +1894,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
       // To fix issue #1234
       // check for initializers and add space or ignore based on the option.
-      if (get_chunk_parent_type(first) == CT_FUNC_CALL)
+      if (first->GetParentType() == CT_FUNC_CALL)
       {
-         Chunk *tmp = first->GetPrevType(get_chunk_parent_type(first), first->level);
+         Chunk *tmp = first->GetPrevType(first->GetParentType(), first->GetLevel());
          tmp = tmp->GetPrevNcNnl();
 
-         if (chunk_is_token(tmp, CT_NEW))
+         if (tmp->Is(CT_NEW))
          {
             // Add or remove space between ')' and '{' of s function call in object
             // initialization.
@@ -1969,56 +1913,56 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_fparen_brace());
    }
 
-   if (  chunk_is_token(first, CT_D_TEMPLATE)
-      || chunk_is_token(second, CT_D_TEMPLATE))
+   if (  first->Is(CT_D_TEMPLATE)
+      || second->Is(CT_D_TEMPLATE))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (  chunk_is_token(first, CT_ELSE)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_ELSE)
+      && second->Is(CT_BRACE_OPEN))
    {
       // Add or remove space between 'else' and '{' if on the same line.
       log_rule("sp_else_brace");
       return(options::sp_else_brace());
    }
 
-   if (  chunk_is_token(first, CT_ELSE)
-      && chunk_is_token(second, CT_ELSEIF))
+   if (  first->Is(CT_ELSE)
+      && second->Is(CT_ELSEIF))
    {
       log_rule("FORCE");
       return(IARF_FORCE);
    }
 
-   if (  chunk_is_token(first, CT_FINALLY)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_FINALLY)
+      && second->Is(CT_BRACE_OPEN))
    {
       // Add or remove space between 'finally' and '{' if on the same line.
       log_rule("sp_finally_brace");
       return(options::sp_finally_brace());
    }
 
-   if (  chunk_is_token(first, CT_TRY)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_TRY)
+      && second->Is(CT_BRACE_OPEN))
    {
       // Add or remove space between 'try' and '{' if on the same line.
       log_rule("sp_try_brace");
       return(options::sp_try_brace());
    }
 
-   if (  chunk_is_token(first, CT_GETSET)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_GETSET)
+      && second->Is(CT_BRACE_OPEN))
    {
       // Add or remove space between get/set and '{' if on the same line.
       log_rule("sp_getset_brace");
       return(options::sp_getset_brace());
    }
 
-   if (  chunk_is_token(first, CT_WORD)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_WORD)
+      && second->Is(CT_BRACE_OPEN))
    {
-      if (get_chunk_parent_type(first) == CT_NAMESPACE)
+      if (first->GetParentType() == CT_NAMESPACE)
       {
          // Add or remove space between a variable and '{' for a namespace.
          log_rule("sp_word_brace_ns");
@@ -2027,19 +1971,19 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_D)
-      && chunk_is_token(second, CT_PAREN_OPEN)
-      && get_chunk_parent_type(second) == CT_INVARIANT)
+      && second->Is(CT_PAREN_OPEN)
+      && second->GetParentType() == CT_INVARIANT)
    {
       // (D) Add or remove space between 'invariant' and '('.
       log_rule("sp_invariant_paren");
       return(options::sp_invariant_paren());
    }
 
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(first) != CT_DECLTYPE)
+   if (  first->Is(CT_PAREN_CLOSE)
+      && first->GetParentType() != CT_DECLTYPE)
    {
       if (  language_is_set(LANG_D)
-         && get_chunk_parent_type(first) == CT_INVARIANT)
+         && first->GetParentType() == CT_INVARIANT)
       {
          // (D) Add or remove space after the ')' in 'invariant (C) c'.
          log_rule("sp_after_invariant_paren");
@@ -2047,7 +1991,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
 
       // "(struct foo) {...}" vs. "(struct foo){...}"
-      if (chunk_is_token(second, CT_BRACE_OPEN))
+      if (second->Is(CT_BRACE_OPEN))
       {
          // Add or remove space between ')' and '{'.
          log_rule("sp_paren_brace");
@@ -2055,21 +1999,21 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
 
       // D-specific: "delegate(some thing) dg
-      if (get_chunk_parent_type(first) == CT_DELEGATE)
+      if (first->GetParentType() == CT_DELEGATE)
       {
          log_rule("ADD");
          return(IARF_ADD);
       }
 
       // PAWN-specific: "state (condition) next"
-      if (get_chunk_parent_type(first) == CT_STATE)
+      if (first->GetParentType() == CT_STATE)
       {
          log_rule("ADD");
          return(IARF_ADD);
       }
 
       /* C++ new operator: new(bar) Foo */
-      if (get_chunk_parent_type(first) == CT_NEW)
+      if (first->GetParentType() == CT_NEW)
       {
          // Add or remove space between ')' and type in 'new(foo) BAR'.
          log_rule("sp_after_newop_paren");
@@ -2079,12 +2023,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    /* "((" vs. "( (" or "))" vs. ") )" */
    // Issue #1342
-   if (  (  chunk_is_str(first, "(")
-         && chunk_is_str(second, "("))
-      || (  chunk_is_str(first, ")")
-         && chunk_is_str(second, ")")))
+   if (  (  first->IsString("(")
+         && second->IsString("("))
+      || (  first->IsString(")")
+         && second->IsString(")")))
    {
-      if (get_chunk_parent_type(second) == CT_FUNC_CALL_USER)
+      if (second->GetParentType() == CT_FUNC_CALL_USER)
       {
          // Add or remove space between nested parentheses with user functions,
          // i.e. '((' vs. '( ('.
@@ -2093,8 +2037,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
 
       if (  options::sp_sparen_paren() != IARF_IGNORE
-         && (  chunk_is_token(first, CT_SPAREN_OPEN)
-            || chunk_is_token(second, CT_SPAREN_CLOSE)))
+         && (  first->Is(CT_SPAREN_OPEN)
+            || second->Is(CT_SPAREN_CLOSE)))
       {
          // Add or remove space between nested parentheses with control
          // statements, i.e. 'if ((' vs. 'if ( ('. Issue #3209
@@ -2107,21 +2051,21 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "foo(...)" vs. "foo( ... )"
-   if (  chunk_is_token(first, CT_FPAREN_OPEN)
-      || chunk_is_token(second, CT_FPAREN_CLOSE))
+   if (  first->Is(CT_FPAREN_OPEN)
+      || second->Is(CT_FPAREN_CLOSE))
    {
-      if (  (get_chunk_parent_type(first) == CT_FUNC_CALL_USER)
-         || (  (get_chunk_parent_type(second) == CT_FUNC_CALL_USER)
-            && (  (chunk_is_token(first, CT_WORD))
-               || (chunk_is_token(first, CT_SQUARE_CLOSE)))))
+      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_fparen");
          return(options::sp_func_call_user_inside_fparen());
       }
 
-      if (  chunk_is_token(first, CT_FPAREN_OPEN)
-         && chunk_is_token(second, CT_FPAREN_CLOSE))
+      if (  first->Is(CT_FPAREN_OPEN)
+         && second->Is(CT_FPAREN_CLOSE))
       {
          // Add or remove space inside empty function '()'.
          log_rule("sp_inside_fparens");
@@ -2133,8 +2077,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "foo(...)" vs. "foo( ... )"
-   if (  chunk_is_token(first, CT_TPAREN_OPEN)
-      || chunk_is_token(second, CT_TPAREN_CLOSE))
+   if (  first->Is(CT_TPAREN_OPEN)
+      || second->Is(CT_TPAREN_CLOSE))
    {
       // Add or remove space inside the first parentheses in a function type, as in
       // 'void (*x)(...)'.
@@ -2143,11 +2087,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_PAREN_CLOSE))
+      && first->Is(CT_PAREN_CLOSE))
    {
-      if (  first->flags.test(PCF_OC_RTYPE) // == CT_OC_RTYPE)
-         && (  get_chunk_parent_type(first) == CT_OC_MSG_DECL
-            || get_chunk_parent_type(first) == CT_OC_MSG_SPEC))
+      if (  first->TestFlags(PCF_OC_RTYPE) // == CT_OC_RTYPE)
+         && (  first->GetParentType() == CT_OC_MSG_DECL
+            || first->GetParentType() == CT_OC_MSG_SPEC))
       {
          // (OC) Add or remove space after the first (type) in message specs,
          // i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
@@ -2155,8 +2099,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_after_oc_return_type());
       }
 
-      if (  get_chunk_parent_type(first) == CT_OC_MSG_SPEC
-         || get_chunk_parent_type(first) == CT_OC_MSG_DECL)
+      if (  first->GetParentType() == CT_OC_MSG_SPEC
+         || first->GetParentType() == CT_OC_MSG_DECL)
       {
          // (OC) Add or remove space after the (type) in message specs,
          // i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
@@ -2164,8 +2108,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_after_oc_type());
       }
 
-      if (  get_chunk_parent_type(first) == CT_OC_SEL
-         && second->type != CT_SQUARE_CLOSE)
+      if (  first->GetParentType() == CT_OC_SEL
+         && second->IsNot(CT_SQUARE_CLOSE))
       {
          // (OC) Add or remove space between '@selector(x)' and the following word,
          // i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
@@ -2177,12 +2121,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    if (  language_is_set(LANG_OC)
       && options::sp_inside_oc_at_sel_parens() != IARF_IGNORE)
    {
-      if (  (  chunk_is_token(first, CT_PAREN_OPEN)
-            && (  get_chunk_parent_type(first) == CT_OC_SEL
-               || get_chunk_parent_type(first) == CT_OC_PROTOCOL))
-         || (  chunk_is_token(second, CT_PAREN_CLOSE)
-            && (  get_chunk_parent_type(second) == CT_OC_SEL
-               || get_chunk_parent_type(second) == CT_OC_PROTOCOL)))
+      if (  (  first->Is(CT_PAREN_OPEN)
+            && (  first->GetParentType() == CT_OC_SEL
+               || first->GetParentType() == CT_OC_PROTOCOL))
+         || (  second->Is(CT_PAREN_CLOSE)
+            && (  second->GetParentType() == CT_OC_SEL
+               || second->GetParentType() == CT_OC_PROTOCOL)))
       {
          // (OC) Add or remove space inside '@selector' parentheses,
          // i.e. '@selector(foo)' vs. '@selector( foo )'.
@@ -2192,9 +2136,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(second, CT_PAREN_OPEN)
-      && (  chunk_is_token(first, CT_OC_SEL)
-         || chunk_is_token(first, CT_OC_PROTOCOL)))
+   if (  second->Is(CT_PAREN_OPEN)
+      && (  first->Is(CT_OC_SEL)
+         || first->Is(CT_OC_PROTOCOL)))
    {
       // (OC) Add or remove space between '@selector' and '(',
       // i.e. '@selector(msgName)' vs. '@selector (msgName)'.
@@ -2208,18 +2152,18 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
     * D cast:   "cast(int)"  vs. "cast( int )"
     * CPP cast: "int(a + 3)" vs. "int( a + 3 )"
     */
-   if (chunk_is_token(first, CT_PAREN_OPEN))
+   if (first->Is(CT_PAREN_OPEN))
    {
-      if (  get_chunk_parent_type(first) == CT_C_CAST
-         || get_chunk_parent_type(first) == CT_CPP_CAST
-         || get_chunk_parent_type(first) == CT_D_CAST)
+      if (  first->GetParentType() == CT_C_CAST
+         || first->GetParentType() == CT_CPP_CAST
+         || first->GetParentType() == CT_D_CAST)
       {
          // Add or remove spaces inside cast parentheses.
          log_rule("sp_inside_paren_cast");
          return(options::sp_inside_paren_cast());
       }
 
-      if (get_chunk_parent_type(first) == CT_NEW)
+      if (first->GetParentType() == CT_NEW)
       {
          if (options::sp_inside_newop_paren_open() != IARF_IGNORE)
          {
@@ -2232,7 +2176,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
          if (options::sp_inside_newop_paren() != IARF_IGNORE)
          {
-            // Add or remove space inside parenthesis of the new operator
+            // Add or remove space inside parentheses of the new operator
             // as in 'new(foo) BAR'.
             log_rule("sp_inside_newop_paren");
             return(options::sp_inside_newop_paren());
@@ -2242,18 +2186,18 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_inside_paren());
    }
 
-   if (chunk_is_token(second, CT_PAREN_CLOSE))
+   if (second->Is(CT_PAREN_CLOSE))
    {
-      if (  get_chunk_parent_type(second) == CT_C_CAST
-         || get_chunk_parent_type(second) == CT_CPP_CAST
-         || get_chunk_parent_type(second) == CT_D_CAST)
+      if (  second->GetParentType() == CT_C_CAST
+         || second->GetParentType() == CT_CPP_CAST
+         || second->GetParentType() == CT_D_CAST)
       {
          // Add or remove spaces inside cast parentheses.
          log_rule("sp_inside_paren_cast");
          return(options::sp_inside_paren_cast());
       }
 
-      if (get_chunk_parent_type(second) == CT_NEW)
+      if (second->GetParentType() == CT_NEW)
       {
          if (options::sp_inside_newop_paren_close() != IARF_IGNORE)
          {
@@ -2266,7 +2210,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
          if (options::sp_inside_newop_paren() != IARF_IGNORE)
          {
-            // Add or remove space inside parenthesis of the new operator
+            // Add or remove space inside parentheses of the new operator
             // as in 'new(foo) BAR'.
             log_rule("sp_inside_newop_paren");
             return(options::sp_inside_newop_paren());
@@ -2277,8 +2221,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_inside_paren());
    }
 
-   if (  chunk_is_token(first, CT_SQUARE_OPEN)
-      && chunk_is_token(second, CT_SQUARE_CLOSE))
+   if (  first->Is(CT_SQUARE_OPEN)
+      && second->Is(CT_SQUARE_CLOSE))
    {
       // Add or remove space inside '[]'.
       log_rule("sp_inside_square_empty");
@@ -2286,14 +2230,14 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "[3]" vs. "[ 3 ]" or for objective-c "@[@3]" vs. "@[ @3 ]"
-   if (  chunk_is_token(first, CT_SQUARE_OPEN)
-      || chunk_is_token(second, CT_SQUARE_CLOSE))
+   if (  first->Is(CT_SQUARE_OPEN)
+      || second->Is(CT_SQUARE_CLOSE))
    {
       if (  language_is_set(LANG_OC)
-         && (  (  get_chunk_parent_type(first) == CT_OC_AT
-               && chunk_is_token(first, CT_SQUARE_OPEN))
-            || (  get_chunk_parent_type(second) == CT_OC_AT
-               && chunk_is_token(second, CT_SQUARE_CLOSE)))
+         && (  (  first->GetParentType() == CT_OC_AT
+               && first->Is(CT_SQUARE_OPEN))
+            || (  second->GetParentType() == CT_OC_AT
+               && second->Is(CT_SQUARE_CLOSE)))
          && (options::sp_inside_square_oc_array() != IARF_IGNORE))
       {
          // (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
@@ -2306,8 +2250,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_inside_square());
    }
 
-   if (  chunk_is_token(first, CT_SQUARE_CLOSE)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
+   if (  first->Is(CT_SQUARE_CLOSE)
+      && second->Is(CT_FPAREN_OPEN))
    {
       // Add or remove space between ']' and '(' when part of a function call.
       log_rule("sp_square_fparen");
@@ -2315,9 +2259,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "if(...)" vs. "if( ... )" etc.
-   if (chunk_is_token(second, CT_SPAREN_CLOSE))
+   if (second->Is(CT_SPAREN_CLOSE))
    {
-      if (  get_chunk_parent_type(second) == CT_FOR
+      if (  second->GetParentType() == CT_FOR
          && options::sp_inside_for_open() != IARF_IGNORE)
       {
          // Add or remove space before ')' of 'for' statements.
@@ -2334,9 +2278,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_SPAREN_OPEN))
+   if (first->Is(CT_SPAREN_OPEN))
    {
-      if (  get_chunk_parent_type(first) == CT_FOR
+      if (  first->GetParentType() == CT_FOR
          && options::sp_inside_for_open() != IARF_IGNORE)
       {
          // Add or remove space before ')' of 'for' statements.
@@ -2353,9 +2297,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_SPAREN_OPEN))
+   if (first->Is(CT_SPAREN_OPEN))
    {
-      if (get_chunk_parent_type(first) == CT_FOR)
+      if (first->GetParentType() == CT_FOR)
       {
          // Add or remove space inside '(' and ')' of 'for' statements.
          log_rule("sp_inside_for");
@@ -2369,9 +2313,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(second, CT_SPAREN_CLOSE))
+   if (second->Is(CT_SPAREN_CLOSE))
    {
-      if (get_chunk_parent_type(second) == CT_FOR)
+      if (second->GetParentType() == CT_FOR)
       {
          // Add or remove space inside '(' and ')' of 'for' statements.
          log_rule("sp_inside_for");
@@ -2385,11 +2329,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_CLASS_COLON))
+   if (first->Is(CT_CLASS_COLON))
    {
-      if (  get_chunk_parent_type(first) == CT_OC_CLASS
-         && (  first->GetPrevType(CT_OC_INTF, first->level, E_Scope::ALL)->IsNullChunk()
-            && first->GetPrevType(CT_OC_IMPL, first->level, E_Scope::ALL)->IsNullChunk()))
+      if (  first->GetParentType() == CT_OC_CLASS
+         && (  first->GetPrevType(CT_OC_INTF, first->GetLevel(), E_Scope::ALL)->IsNullChunk()
+            && first->GetPrevType(CT_OC_IMPL, first->GetLevel(), E_Scope::ALL)->IsNullChunk()))
       {
          if (options::sp_after_oc_colon() != IARF_IGNORE)
          {
@@ -2409,15 +2353,15 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(second, CT_CLASS_COLON))
+   if (second->Is(CT_CLASS_COLON))
    {
       if (  language_is_set(LANG_OC)
-         && get_chunk_parent_type(second) == CT_OC_CLASS
-         && (  second->GetPrevType(CT_OC_INTF, second->level, E_Scope::ALL)->IsNullChunk()
-            && second->GetPrevType(CT_OC_IMPL, second->level, E_Scope::ALL)->IsNullChunk()))
+         && second->GetParentType() == CT_OC_CLASS
+         && (  second->GetPrevType(CT_OC_INTF, second->GetLevel(), E_Scope::ALL)->IsNullChunk()
+            && second->GetPrevType(CT_OC_IMPL, second->GetLevel(), E_Scope::ALL)->IsNullChunk()))
       {
-         if (  get_chunk_parent_type(second) == CT_OC_CLASS
-            && second->GetPrevType(CT_OC_INTF, second->level, E_Scope::ALL)->IsNullChunk())
+         if (  second->GetParentType() == CT_OC_CLASS
+            && second->GetPrevType(CT_OC_INTF, second->GetLevel(), E_Scope::ALL)->IsNullChunk())
          {
             if (options::sp_before_oc_colon() != IARF_IGNORE)
             {
@@ -2438,7 +2382,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_CONSTR_COLON))
+   if (first->Is(CT_CONSTR_COLON))
    {
       min_sp = options::indent_ctor_init_leading() - 1; // default indent is 1 space
       // Add or remove space after class constructor ':'.
@@ -2446,34 +2390,34 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_after_constr_colon());
    }
 
-   if (chunk_is_token(second, CT_CONSTR_COLON))
+   if (second->Is(CT_CONSTR_COLON))
    {
       // Add or remove space before class constructor ':'.
       log_rule("sp_before_constr_colon");
       return(options::sp_before_constr_colon());
    }
 
-   if (chunk_is_token(second, CT_CASE_COLON))
+   if (second->Is(CT_CASE_COLON))
    {
       // Add or remove space before case ':'.
       log_rule("sp_before_case_colon");
       return(options::sp_before_case_colon());
    }
 
-   if (chunk_is_token(first, CT_DOT))
+   if (first->Is(CT_DOT))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(second, CT_DOT))
+   if (second->Is(CT_DOT))
    {
       log_rule("ADD");
       return(IARF_ADD);
    }
 
-   if (  chunk_is_token(first, CT_NULLCOND)
-      || chunk_is_token(second, CT_NULLCOND))
+   if (  first->Is(CT_NULLCOND)
+      || second->Is(CT_NULLCOND))
    {
       // TODO: provide some test data to check this block
       // LANG_CS  null conditional operator
@@ -2482,21 +2426,21 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_member());
    }
 
-   if (  chunk_is_token(first, CT_ARITH)
-      || chunk_is_token(first, CT_SHIFT)
-      || chunk_is_token(first, CT_CARET)
-      || chunk_is_token(second, CT_ARITH)
-      || chunk_is_token(second, CT_SHIFT)
-      || chunk_is_token(second, CT_CARET))
+   if (  first->Is(CT_ARITH)
+      || first->Is(CT_SHIFT)
+      || first->Is(CT_CARET)
+      || second->Is(CT_ARITH)
+      || second->Is(CT_SHIFT)
+      || second->Is(CT_CARET))
    {
       // Add or remove space around arithmetic operators '+' and '-'.
       // Overrides sp_arith.
       if (options::sp_arith_additive() != IARF_IGNORE)
       {
-         auto arith_char = (  chunk_is_token(first, CT_ARITH)
-                           || chunk_is_token(first, CT_SHIFT)
-                           || chunk_is_token(first, CT_CARET))
-                           ? first->str[0] : second->str[0];
+         auto arith_char = (  first->Is(CT_ARITH)
+                           || first->Is(CT_SHIFT)
+                           || first->Is(CT_CARET))
+                           ? first->GetStr()[0] : second->GetStr()[0];
 
          if (  arith_char == '+'
             || arith_char == '-')
@@ -2511,14 +2455,14 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_arith());
    }
 
-   if (  chunk_is_token(first, CT_BOOL)
-      || chunk_is_token(second, CT_BOOL))
+   if (  first->Is(CT_BOOL)
+      || second->Is(CT_BOOL))
    {
       // Add or remove space around boolean operators '&&' and '||'.
       iarf_e arg = options::sp_bool();
 
       if (  (options::pos_bool() != TP_IGNORE)
-         && first->orig_line != second->orig_line)
+         && first->GetOrigLine() != second->GetOrigLine())
       {
          arg = arg | IARF_ADD;
       }
@@ -2526,56 +2470,56 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(arg);
    }
 
-   if (  chunk_is_token(first, CT_COMPARE)
-      || chunk_is_token(second, CT_COMPARE))
+   if (  first->Is(CT_COMPARE)
+      || second->Is(CT_COMPARE))
    {
       // Add or remove space around compare operator '<', '>', '==', etc.
       log_rule("sp_compare");
       return(options::sp_compare());
    }
 
-   if (  chunk_is_token(first, CT_PAREN_OPEN)
-      && chunk_is_token(second, CT_PTR_TYPE))
+   if (  first->Is(CT_PAREN_OPEN)
+      && second->Is(CT_PTR_TYPE))
    {
       // TODO: provide some test data to check this block
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_PTR_TYPE))                            // see the tests cpp:34505-34508
+   if (first->Is(CT_PTR_TYPE))                            // see the tests cpp:34505-34508
    {
-      if (  chunk_is_token(second, CT_FPAREN_OPEN)
-         || chunk_is_token(second, CT_TPAREN_OPEN))
+      if (  second->Is(CT_FPAREN_OPEN)
+         || second->Is(CT_TPAREN_OPEN))
       {
          // Add or remove space after a pointer star '*', if followed by an open
          // parenthesis, as in 'void* (*)()'.
          log_rule("sp_ptr_star_paren");                               // ptr_star 10
          return(options::sp_ptr_star_paren());
       }
-      else if (chunk_is_token(second, CT_PTR_TYPE))
+      else if (second->Is(CT_PTR_TYPE))
       {
          // Add or remove space between pointer stars '*'.
          // as in 'int ***a;'.
          log_rule("sp_between_ptr_star");                             // ptr_star 9
          return(options::sp_between_ptr_star());
       }
-      else if (chunk_is_token(second, CT_FUNC_VAR))
+      else if (second->Is(CT_FUNC_VAR))
       {
          // Add or remove space between the pointer star '*' and the name of the
          // variable in a function pointer definition.
          log_rule("sp_ptr_star_func_var");
          return(options::sp_ptr_star_func_var());
       }
-      else if (chunk_is_token(second, CT_FUNC_TYPE))
+      else if (second->Is(CT_FUNC_TYPE))
       {
          // Add or remove space between the pointer star '*' and the name of the
          // type in a function pointer type definition.
          log_rule("sp_ptr_star_func_type");
          return(options::sp_ptr_star_func_type());
       }
-      else if (  get_chunk_parent_type(first) == CT_FUNC_DEF
-              || get_chunk_parent_type(first) == CT_FUNC_PROTO
-              || get_chunk_parent_type(first) == CT_FUNC_VAR)
+      else if (  first->GetParentType() == CT_FUNC_DEF
+              || first->GetParentType() == CT_FUNC_PROTO
+              || first->GetParentType() == CT_FUNC_VAR)
       {
          if (token_is_within_trailing_return(first))
          {
@@ -2592,25 +2536,25 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
             return(options::sp_after_ptr_star_func());
          }
       }
-      else if (CharTable::IsKw1(second->str[0]))
+      else if (CharTable::IsKw1(second->GetStr()[0]))
       {
          Chunk *prev = first->GetPrev();
 
-         if (chunk_is_token(prev, CT_IN))
+         if (prev->Is(CT_IN))
          {
             // Add or remove space after the '*' (dereference) unary operator. This does
             // not affect the spacing after a '*' that is part of a type.
             log_rule("sp_deref");
             return(options::sp_deref());
          }
-         else if (  get_chunk_parent_type(first) == CT_FUNC_VAR
-                 || get_chunk_parent_type(first) == CT_FUNC_TYPE)
+         else if (  first->GetParentType() == CT_FUNC_VAR
+                 || first->GetParentType() == CT_FUNC_TYPE)
          {
             // Add or remove space after pointer caret '^', if followed by a word.
             log_rule("sp_after_ptr_block_caret");
             return(options::sp_after_ptr_block_caret());
          }
-         else if (chunk_is_token(second, CT_QUALIFIER))
+         else if (second->Is(CT_QUALIFIER))
          {
             // Add or remove space after pointer star '*', if followed by a qualifier.
             log_rule("sp_after_ptr_star_qualifier");                  // ptr_star 4
@@ -2620,7 +2564,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          log_rule("sp_after_ptr_star");                               // ptr_star 1
          return(options::sp_after_ptr_star());
       }
-      else if (chunk_is_token(second, CT_PAREN_OPEN))
+      else if (second->Is(CT_PAREN_OPEN))
       {
          // Add or remove space after pointer star '*', if followed by a word.
          log_rule("sp_after_ptr_star");                               // ptr_star 1
@@ -2636,8 +2580,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(second, CT_PTR_TYPE)
-      && first->type != CT_IN)
+   if (  second->Is(CT_PTR_TYPE)
+      && first->IsNot(CT_IN))
    {
       // look back for '->' type is TRAILING_RET
       if (token_is_within_trailing_return(second))
@@ -2656,10 +2600,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          do
          {
             next = next->GetNext();
-         } while (chunk_is_token(next, CT_PTR_TYPE));
+         } while (next->Is(CT_PTR_TYPE));
 
-         if (  chunk_is_token(next, CT_FUNC_DEF)
-            || chunk_is_token(next, CT_FUNC_PROTO))
+         if (  next->Is(CT_FUNC_DEF)
+            || next->Is(CT_FUNC_PROTO))
          {
             log_rule("sp_before_ptr_star_func");                      // ptr_star 6
             return(options::sp_before_ptr_star_func());
@@ -2672,13 +2616,13 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       {
          Chunk *next = second->GetNextNc();
 
-         while (chunk_is_token(next, CT_PTR_TYPE))
+         while (next->Is(CT_PTR_TYPE))
          {
             next = next->GetNextNc();
          }
 
          if (  next->IsNotNullChunk()
-            && next->type != CT_WORD)
+            && next->IsNot(CT_WORD))
          {
             log_rule("sp_before_unnamed_ptr_star");                   // ptr_star 8
             return(options::sp_before_unnamed_ptr_star());
@@ -2693,18 +2637,18 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_OPERATOR))
+   if (first->Is(CT_OPERATOR))
    {
       // Add or remove space between 'operator' and operator sign.
       log_rule("sp_after_operator");
       return(options::sp_after_operator());
    }
 
-   if (  chunk_is_token(second, CT_FUNC_PROTO)
-      || chunk_is_token(second, CT_FUNC_DEF))
+   if (  second->Is(CT_FUNC_PROTO)
+      || second->Is(CT_FUNC_DEF))
    {
-      if (  first->type != CT_PTR_TYPE
-         && first->type != CT_BYREF)
+      if (  first->IsNot(CT_PTR_TYPE)
+         && first->IsNot(CT_BYREF))
       {
          // Add or remove space between return type and function name. A
          // minimum of 1 is forced except for pointer/reference return types.
@@ -2718,17 +2662,17 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // "(int)a" vs. "(int) a" or "cast(int)a" vs. "cast(int) a"
-   if (  (  get_chunk_parent_type(first) == CT_C_CAST
-         || get_chunk_parent_type(first) == CT_D_CAST)
-      && chunk_is_token(first, CT_PAREN_CLOSE))
+   if (  (  first->GetParentType() == CT_C_CAST
+         || first->GetParentType() == CT_D_CAST)
+      && first->Is(CT_PAREN_CLOSE))
    {
       log_rule("sp_after_cast");
       return(options::sp_after_cast());
    }
 
-   if (chunk_is_token(first, CT_BRACE_CLOSE))
+   if (first->Is(CT_BRACE_CLOSE))
    {
-      if (chunk_is_token(second, CT_ELSE))
+      if (second->Is(CT_ELSE))
       {
          // Add or remove space between '}' and 'else' if on the same line.
          log_rule("sp_brace_else");
@@ -2736,7 +2680,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
 
       if (  language_is_set(LANG_OC)
-         && chunk_is_token(second, CT_CATCH)
+         && second->Is(CT_CATCH)
          && (options::sp_oc_brace_catch() != IARF_IGNORE))
       {
          // TODO: provide some test data to check this block
@@ -2746,7 +2690,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_oc_brace_catch());
       }
 
-      if (chunk_is_token(second, CT_CATCH))
+      if (second->Is(CT_CATCH))
       {
          // TODO: provide some test data to check this block
          // Add or remove space between '}' and 'catch' if on the same line.
@@ -2754,7 +2698,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_brace_catch());
       }
 
-      if (chunk_is_token(second, CT_FINALLY))
+      if (second->Is(CT_FINALLY))
       {
          // Add or remove space between '}' and 'finally' if on the same line.
          log_rule("sp_brace_finally");
@@ -2762,22 +2706,22 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_BRACE_OPEN))
+   if (first->Is(CT_BRACE_OPEN))
    {
-      if (get_chunk_parent_type(first) == CT_ENUM)
+      if (first->GetParentType() == CT_ENUM)
       {
          // Add or remove space inside enum '{' and '}'.
          log_rule("sp_inside_braces_enum");
          return(options::sp_inside_braces_enum());
       }
 
-      if (  get_chunk_parent_type(first) == CT_STRUCT
-         || get_chunk_parent_type(first) == CT_UNION)
+      if (  first->GetParentType() == CT_STRUCT
+         || first->GetParentType() == CT_UNION)
       {
          // Fix for issue #1240  adding space in struct initializers
          Chunk *tmp = first->GetPrevNcNnl();
 
-         if (chunk_is_token(tmp, CT_ASSIGN))
+         if (tmp->Is(CT_ASSIGN))
          {
             // TODO: provide some test data to check this block
             log_rule("IGNORE");
@@ -2787,7 +2731,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          log_rule("sp_inside_braces_struct");
          return(options::sp_inside_braces_struct());
       }
-      else if (  get_chunk_parent_type(first) == CT_OC_AT
+      else if (  first->GetParentType() == CT_OC_AT
               && options::sp_inside_braces_oc_dict() != IARF_IGNORE)
       {
          // (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
@@ -2795,13 +2739,13 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_inside_braces_oc_dict());
       }
 
-      if (get_chunk_parent_type(first) == CT_BRACED_INIT_LIST)
+      if (first->GetParentType() == CT_BRACED_INIT_LIST)
       {
          // Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
          // only to help the vim command }}}}
          if (  options::sp_brace_brace() != IARF_IGNORE
-            && chunk_is_token(second, CT_BRACE_OPEN)
-            && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
+            && second->Is(CT_BRACE_OPEN)
+            && second->GetParentType() == CT_BRACED_INIT_LIST)
          {
             log_rule("sp_brace_brace");
             return(options::sp_brace_brace());
@@ -2836,11 +2780,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(first, CT_BRACE_CLOSE)
-      && first->flags.test(PCF_IN_TYPEDEF)
-      && (  get_chunk_parent_type(first) == CT_ENUM
-         || get_chunk_parent_type(first) == CT_STRUCT
-         || get_chunk_parent_type(first) == CT_UNION))
+   if (  first->Is(CT_BRACE_CLOSE)
+      && first->TestFlags(PCF_IN_TYPEDEF)
+      && (  first->GetParentType() == CT_ENUM
+         || first->GetParentType() == CT_STRUCT
+         || first->GetParentType() == CT_UNION))
    {
       // Add or remove space between '}' and the name of a typedef on the same line.
       log_rule("sp_brace_typedef");
@@ -2848,8 +2792,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_D)
-      && chunk_is_token(second, CT_PAREN_OPEN)
-      && get_chunk_parent_type(second) == CT_TEMPLATE)
+      && second->Is(CT_PAREN_OPEN)
+      && second->GetParentType() == CT_TEMPLATE)
    {
       // (D) Add or remove space before the parenthesis in the D constructs
       // 'template Foo(' and 'class Foo('.
@@ -2858,11 +2802,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // Issue #3080
-   if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_DECLTYPE
-      && (  chunk_is_token(second, CT_WORD)
-         || chunk_is_token(second, CT_BRACE_OPEN)
-         || chunk_is_token(second, CT_FUNC_CALL)))
+   if (  first->Is(CT_PAREN_CLOSE)
+      && first->GetParentType() == CT_DECLTYPE
+      && (  second->Is(CT_WORD)
+         || second->Is(CT_BRACE_OPEN)
+         || second->Is(CT_FUNC_CALL)))
    {
       iarf_e arg = options::sp_after_decltype();
       // Add or remove space between 'decltype(...)' and word, brace or function call.
@@ -2872,8 +2816,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    // Issue #3080
    if (  !language_is_set(LANG_D)
-      && chunk_is_token(first, CT_PAREN_CLOSE)
-      && chunk_is_token(second, CT_WORD))
+      && first->Is(CT_PAREN_CLOSE)
+      && second->Is(CT_WORD))
    {
       // Add or remove space between type and word.
       log_rule("sp_after_type");
@@ -2882,26 +2826,21 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    // see if the D template expression is used as a type
    if (  language_is_set(LANG_D)
-      && chunk_is_token(first, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_D_TEMPLATE)
+      && first->Is(CT_PAREN_CLOSE)
+      && first->GetParentType() == CT_D_TEMPLATE)
    {
-      if (get_chunk_parent_type(second) == CT_USING_ALIAS)
+      if (second->GetParentType() == CT_USING_ALIAS)
       {
          log_rule("sp_after_type | ADD");
          return(options::sp_after_type() | IARF_ADD);
       }
 
-      if (chunk_is_token(second, CT_WORD))
+      if (second->Is(CT_WORD))
       {
-         Chunk *open_paren = chunk_skip_to_match_rev(first);
+         Chunk *open_paren = first->GetOpeningParen();
+         Chunk *type       = open_paren->GetPrev()->GetPrev();
 
-         if (open_paren == nullptr)
-         {
-            open_paren = Chunk::NullChunkPtr;
-         }
-         Chunk *type = open_paren->GetPrev()->GetPrev();
-
-         if (chunk_is_token(type, CT_TYPE))
+         if (type->Is(CT_TYPE))
          {
             log_rule("sp_after_type");
             return(options::sp_after_type());
@@ -2909,16 +2848,16 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(first, CT_TYPE)                   // Issue #3457
-      && chunk_is_token(second, CT_COLON))
+   if (  first->Is(CT_TYPE)                   // Issue #3457
+      && second->Is(CT_COLON))
    {
       log_rule("sp_type_colon");
       return(options::sp_type_colon());
    }
 
-   if (  !chunk_is_token(second, CT_PTR_TYPE)
-      && (  chunk_is_token(first, CT_QUALIFIER)
-         || chunk_is_token(first, CT_TYPE)))
+   if (  !second->Is(CT_PTR_TYPE)
+      && (  first->Is(CT_QUALIFIER)
+         || first->Is(CT_TYPE)))
    {
       // Add or remove space between type and word. In cases where total removal of
       // whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -2934,24 +2873,24 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(arg);
    }
 
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      && chunk_is_token(second, CT_ELLIPSIS))
+   if (  first->Is(CT_PTR_TYPE)
+      && second->Is(CT_ELLIPSIS))
    {
       log_rule("sp_ptr_type_ellipsis");
       return(options::sp_ptr_type_ellipsis());
    }
 
    // If nothing claimed the PTR_TYPE, then return ignore
-   if (  chunk_is_token(first, CT_PTR_TYPE)
-      || chunk_is_token(second, CT_PTR_TYPE))
+   if (  first->Is(CT_PTR_TYPE)
+      || second->Is(CT_PTR_TYPE))
    {
       log_rule("IGNORE");
       return(IARF_IGNORE);
    }
 
-   if (chunk_is_token(first, CT_NOT))
+   if (first->Is(CT_NOT))
    {
-      if (  chunk_is_token(second, CT_NOT)
+      if (  second->Is(CT_NOT)
          && (options::sp_not_not() != IARF_IGNORE))
       {
          log_rule("sp_not_not");
@@ -2962,14 +2901,14 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_not());
    }
 
-   if (chunk_is_token(first, CT_INV))
+   if (first->Is(CT_INV))
    {
       // Add or remove space after the '~' (invert) unary operator.
       log_rule("sp_inv");
       return(options::sp_inv());
    }
 
-   if (chunk_is_token(first, CT_ADDR))
+   if (first->Is(CT_ADDR))
    {
       // Add or remove space after the '&' (address-of) unary operator. This does not
       // affect the spacing after a '&' that is part of a type.
@@ -2977,7 +2916,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_addr());
    }
 
-   if (chunk_is_token(first, CT_DEREF))
+   if (first->Is(CT_DEREF))
    {
       // Add or remove space after the '*' (dereference) unary operator. This does
       // not affect the spacing after a '*' that is part of a type.
@@ -2985,16 +2924,16 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_deref());
    }
 
-   if (  chunk_is_token(first, CT_POS)
-      || chunk_is_token(first, CT_NEG))
+   if (  first->Is(CT_POS)
+      || first->Is(CT_NEG))
    {
       // Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
       log_rule("sp_sign");
       return(options::sp_sign());
    }
 
-   if (  chunk_is_token(first, CT_INCDEC_BEFORE)
-      || chunk_is_token(second, CT_INCDEC_AFTER))
+   if (  first->Is(CT_INCDEC_BEFORE)
+      || second->Is(CT_INCDEC_AFTER))
    {
       // Add or remove space between '++' and '--' the word to which it is being
       // applied, as in '(--x)' or 'y++;'.
@@ -3002,20 +2941,20 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_incdec());
    }
 
-   if (chunk_is_token(second, CT_CS_SQ_COLON))
+   if (second->Is(CT_CS_SQ_COLON))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_CS_SQ_COLON))
+   if (first->Is(CT_CS_SQ_COLON))
    {
       log_rule("FORCE");
       return(IARF_FORCE);
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_OC_SCOPE))
+      && first->Is(CT_OC_SCOPE))
    {
       // (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
       // or '+(int) bar;'.
@@ -3024,7 +2963,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_OC_DICT_COLON))
+      && first->Is(CT_OC_DICT_COLON))
    {
       // (OC) Add or remove space after the colon in immutable dictionary expression
       // 'NSDictionary *test = @{@"foo" :@"bar"};'.
@@ -3033,7 +2972,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(second, CT_OC_DICT_COLON))
+      && second->Is(CT_OC_DICT_COLON))
    {
       // (OC) Add or remove space before the colon in immutable dictionary expression
       // 'NSDictionary *test = @{@"foo" :@"bar"};'.
@@ -3042,9 +2981,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_OC_COLON))
+      && first->Is(CT_OC_COLON))
    {
-      if (first->flags.test(PCF_IN_OC_MSG))
+      if (first->TestFlags(PCF_IN_OC_MSG))
       {
          // (OC) Add or remove space after the colon in message specs,
          // i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
@@ -3058,11 +2997,11 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(second, CT_OC_COLON))
+      && second->Is(CT_OC_COLON))
    {
-      if (  first->flags.test(PCF_IN_OC_MSG)
-         && (  chunk_is_token(first, CT_OC_MSG_FUNC)
-            || chunk_is_token(first, CT_OC_MSG_NAME)))
+      if (  first->TestFlags(PCF_IN_OC_MSG)
+         && (  first->Is(CT_OC_MSG_FUNC)
+            || first->Is(CT_OC_MSG_NAME)))
       {
          // (OC) Add or remove space before the colon in message specs,
          // i.e. '[object setValue:1];' vs. '[object setValue :1];'.
@@ -3075,8 +3014,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_oc_colon());
    }
 
-   if (  chunk_is_token(second, CT_COMMENT)
-      && get_chunk_parent_type(second) == CT_COMMENT_EMBED)
+   if (  second->Is(CT_COMMENT)
+      && second->GetParentType() == CT_COMMENT_EMBED)
    {
       // Add or remove space before an embedded comment.
       // Number of spaces before an embedded comment.
@@ -3085,7 +3024,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_before_emb_cmt());
    }
 
-   if (chunk_is_token(first, CT_COMMENT))
+   if (first->Is(CT_COMMENT))
    {
       // Add or remove space after an embedded comment.
       // Number of spaces after an embedded comment.
@@ -3094,8 +3033,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_after_emb_cmt());
    }
 
-   if (  chunk_is_token(first, CT_NEW)
-      && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  first->Is(CT_NEW)
+      && second->Is(CT_PAREN_OPEN))
    {
       // c# new Constraint, c++ new operator
       // Add or remove space between 'new' and '(' in 'new()'.
@@ -3103,10 +3042,10 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_between_new_paren());
    }
 
-   if (  chunk_is_token(first, CT_NEW)
-      || chunk_is_token(first, CT_DELETE)
-      || (  chunk_is_token(first, CT_TSQUARE)
-         && get_chunk_parent_type(first) == CT_DELETE))
+   if (  first->Is(CT_NEW)
+      || first->Is(CT_DELETE)
+      || (  first->Is(CT_TSQUARE)
+         && first->GetParentType() == CT_DELETE))
    {
       // Add or remove space after 'new', 'delete' and 'delete[]'.
       log_rule("sp_after_new");
@@ -3114,8 +3053,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_JAVA)
-      && chunk_is_token(first, CT_ANNOTATION)
-      && chunk_is_paren_open(second))
+      && first->Is(CT_ANNOTATION)
+      && second->IsParenOpen())
    {
       // (Java) Add or remove space between an annotation and the open parenthesis.
       log_rule("sp_annotation_paren");
@@ -3123,7 +3062,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_OC_PROPERTY))
+      && first->Is(CT_OC_PROPERTY))
    {
       // (OC) Add or remove space after '@property'.
       log_rule("sp_after_oc_property");
@@ -3131,25 +3070,25 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_D)
-      && chunk_is_token(first, CT_EXTERN)
-      && chunk_is_token(second, CT_PAREN_OPEN))
+      && first->Is(CT_EXTERN)
+      && second->Is(CT_PAREN_OPEN))
    {
       // (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
       log_rule("sp_extern_paren");
       return(options::sp_extern_paren());
    }
 
-   if (  chunk_is_token(second, CT_TYPE)
-      && (  (  chunk_is_token(first, CT_STRING)
-            && get_chunk_parent_type(first) == CT_EXTERN)
-         || (  chunk_is_token(first, CT_FPAREN_CLOSE)
-            && get_chunk_parent_type(first) == CT_ATTRIBUTE)))
+   if (  second->Is(CT_TYPE)
+      && (  (  first->Is(CT_STRING)
+            && first->GetParentType() == CT_EXTERN)
+         || (  first->Is(CT_FPAREN_CLOSE)
+            && first->GetParentType() == CT_ATTRIBUTE)))
    {
       log_rule("FORCE");
       return(IARF_FORCE);  /* TODO: make this configurable? */
    }
 
-   if (chunk_is_token(first, CT_NOEXCEPT))
+   if (first->Is(CT_NOEXCEPT))
    {
       // Add or remove space after 'noexcept'.
       log_rule("sp_after_noexcept");
@@ -3157,15 +3096,15 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // Issue #2138
-   if (chunk_is_token(first, CT_FPAREN_CLOSE))
+   if (first->Is(CT_FPAREN_CLOSE))
    {
-      if (chunk_is_token(second, CT_QUALIFIER))
+      if (second->Is(CT_QUALIFIER))
       {
          // Add or remove space between ')' and a qualifier such as 'const'.
          log_rule("sp_paren_qualifier");
          return(options::sp_paren_qualifier());
       }
-      else if (chunk_is_token(second, CT_NOEXCEPT))
+      else if (second->Is(CT_NOEXCEPT))
       {
          // Add or remove space between ')' and 'noexcept'.
          log_rule("sp_paren_noexcept");
@@ -3174,24 +3113,24 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // Issue #2098
-   if (  chunk_is_token(first, CT_PP_PRAGMA)
-      && chunk_is_token(second, CT_PREPROC_BODY))
+   if (  first->Is(CT_PP_PRAGMA)
+      && second->Is(CT_PREPROC_BODY))
    {
       log_rule("REMOVE");
       return(IARF_REMOVE);
    }
 
    // Issue #1733
-   if (  chunk_is_token(first, CT_OPERATOR_VAL)
-      && chunk_is_token(second, CT_TYPE))
+   if (  first->Is(CT_OPERATOR_VAL)
+      && second->Is(CT_TYPE))
    {
       log_rule("IGNORE");
       return(IARF_IGNORE);
    }
 
    // Issue #995
-   if (  chunk_is_token(first, CT_DO)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_DO)
+      && second->Is(CT_BRACE_OPEN))
    {
       // Add or remove space between 'do' and '{'.
       log_rule("sp_do_brace_open");
@@ -3199,8 +3138,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // Issue #995
-   if (  chunk_is_token(first, CT_BRACE_CLOSE)
-      && chunk_is_token(second, CT_WHILE_OF_DO))
+   if (  first->Is(CT_BRACE_CLOSE)
+      && second->Is(CT_WHILE_OF_DO))
    {
       // Add or remove space between '}' and 'while.
       log_rule("sp_brace_close_while");
@@ -3209,23 +3148,23 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    // TODO: have a look to Issue #2186, why NEWLINE?
    // Issue #2524
-   if (  chunk_is_token(first, CT_NEWLINE)
-      && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  first->Is(CT_NEWLINE)
+      && second->Is(CT_BRACE_OPEN))
    {
       log_rule("IGNORE");
       return(IARF_IGNORE);
    }
 
    // =============================================================
-   // categorie 1
+   // category 1
    // this table lists out all combos where a space should NOT be present
    // CT_UNKNOWN is a wildcard.
    for (auto it : no_space_table)
    {
       if (  (  it.first == CT_UNKNOWN
-            || it.first == first->type)
+            || it.first == first->GetType())
          && (  it.second == CT_UNKNOWN
-            || it.second == second->type))
+            || it.second == second->GetType()))
       {
          log_rule("REMOVE from no_space_table");
          return(IARF_REMOVE);
@@ -3233,12 +3172,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // =============================================================
-   // categorie 2
+   // category 2
    // this table lists out all combos where a space MUST be present
    for (auto it : add_space_table)
    {
-      if (  it.first == first->type
-         && it.second == second->type)
+      if (  it.first == first->GetType()
+         && it.second == second->GetType())
       {
          // TODO: if necessary create a new option
          log_rule("ADD from add_space_table");
@@ -3247,23 +3186,23 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // Issue #2386
-   if (  chunk_is_token(first, CT_FORM_FEED)
-      || chunk_is_token(second, CT_FORM_FEED))
+   if (  first->Is(CT_FORM_FEED)
+      || second->Is(CT_FORM_FEED))
    {
       log_rule("IGNORE");
       return(IARF_IGNORE);
    }
 
    // TODO: if necessary create a new option
-   if (  chunk_is_token(first, CT_MACRO_FUNC_CALL)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
+   if (  first->Is(CT_MACRO_FUNC_CALL)
+      && second->Is(CT_FPAREN_OPEN))
    {
       log_rule("IGNORE");
       return(IARF_IGNORE);
    }
 
-   if (  chunk_is_token(first, CT_CASE_ELLIPSIS)
-      && chunk_is_token(second, CT_NUMBER))
+   if (  first->Is(CT_CASE_ELLIPSIS)
+      && second->Is(CT_NUMBER))
    {
       // Add or remove space after the variadic '...' when preceded by a
       // non-punctuator.
@@ -3280,8 +3219,8 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(first, CT_NUMBER)
-      && chunk_is_token(second, CT_CASE_ELLIPSIS))
+   if (  first->Is(CT_NUMBER)
+      && second->Is(CT_CASE_ELLIPSIS))
    {
       // Add or remove space before the variadic '...' when preceded by a
       // non-punctuator.
@@ -3298,18 +3237,18 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
    // =============================================================
-   // categorie 3
+   // category 3
    // these lines are only useful for debugging uncrustify itself
    LOG_FMT(LSPACE, "\n\n%s(%d): WARNING: unrecognize do_space:\n",
            __func__, __LINE__);
-   LOG_FMT(LSPACE, "   first->orig_line  is %zu, first->orig_col  is %zu, first->Text()  '%s', first->type is  %s\n",
-           first->orig_line, first->orig_col, first->Text(), get_token_name(first->type));
-   LOG_FMT(LSPACE, "   second->orig_line is %zu, second->orig_col is %zu, second->Text() '%s', second->type is %s\n",
-           second->orig_line, second->orig_col, second->Text(), get_token_name(second->type));
+   LOG_FMT(LSPACE, "   first orig line  is %zu, orig col  is %zu, Text()  '%s', GetType() is  %s\n",
+           first->GetOrigLine(), first->GetOrigCol(), first->Text(), get_token_name(first->GetType()));
+   LOG_FMT(LSPACE, "   second orig line is %zu, orig col is %zu, Text() '%s', GetType() is %s\n",
+           second->GetOrigLine(), second->GetOrigCol(), second->Text(), get_token_name(second->GetType()));
    LOG_FMT(LSPACE, "   Please make a call at https://github.com/uncrustify/uncrustify/issues/new\n");
    LOG_FMT(LSPACE, "   or merge the line:\n");
-   LOG_FMT(LSPACE, "   {%s,    %s},\n",
-           get_token_name(first->type), get_token_name(second->type));
+   LOG_FMT(LSPACE, "   { CT_%s,    CT_%s},\n",
+           get_token_name(first->GetType()), get_token_name(second->GetType()));
    LOG_FMT(LSPACE, "   in the file <Path_to_uncrustify>/src/add_space_table.h\n");
 
    log_rule("ADD as default value");
@@ -3319,9 +3258,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
 static iarf_e ensure_force_space(Chunk *first, Chunk *second, iarf_e av)
 {
-   if (first->flags.test(PCF_FORCE_SPACE))
+   if (first->TestFlags(PCF_FORCE_SPACE))
    {
-      LOG_FMT(LSPACE, "%s(%d): <force between '%s' and '%s'>",
+      LOG_FMT(LSPACE, "%s(%d): <force between '%s' and '%s'>\n",
               __func__, __LINE__, first->Text(), second->Text());
       return(av | IARF_ADD);
    }
@@ -3337,39 +3276,39 @@ static iarf_e do_space_ensured(Chunk *first, Chunk *second, int &min_sp)
 }
 
 
-void space_text(void)
+void space_text()
 {
    LOG_FUNC_ENTRY();
 
    Chunk  *pc = Chunk::GetHead();
    Chunk  *next;
    size_t prev_column;
-   size_t column = pc->column;
+   size_t column = pc->GetColumn();
 
    while (pc->IsNotNullChunk())
    {
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
-         LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
+         LOG_FMT(LSPACE, "%s(%d): orig line is %zu, orig col is %zu, <Newline>, nl is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetNlCount());
       }
       else
       {
          char copy[1000];
-         LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, '%s' type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type));
+         LOG_FMT(LSPACE, "%s(%d): orig line is %zu, orig col is %zu, '%s' type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy), get_token_name(pc->GetType()));
       }
 
       if (  (options::use_options_overriding_for_qt_macros())
          && (  (strcmp(pc->Text(), "SIGNAL") == 0)
             || (strcmp(pc->Text(), "SLOT") == 0)))
       {
-         LOG_FMT(LSPACE, "%s(%d): orig_col is %zu, type is %s SIGNAL/SLOT found\n",
-                 __func__, __LINE__, pc->orig_line, get_token_name(pc->type));
-         chunk_flags_set(pc, PCF_IN_QT_MACRO); // flag the chunk for a second processing
+         LOG_FMT(LSPACE, "%s(%d): orig col is %zu, type is %s SIGNAL/SLOT found\n",
+                 __func__, __LINE__, pc->GetOrigLine(), get_token_name(pc->GetType()));
+         pc->SetFlagBits(PCF_IN_QT_MACRO); // flag the chunk for a second processing
 
          // save the values
-         save_set_options_for_QT(pc->level);
+         save_set_options_for_QT(pc->GetLevel());
       }
 
       // Bug # 637
@@ -3379,15 +3318,14 @@ void space_text(void)
          next = pc->GetNext();
 
          while (  next->IsEmptyText()
-               && !chunk_is_newline(next)
-               && (  chunk_is_token(next, CT_VBRACE_OPEN)
-                  || chunk_is_token(next, CT_VBRACE_CLOSE)))
+               && !next->IsNewline()
+               && next->IsVBrace())
          {
-            LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, Skip %s (%zu+%zu)\n",
-                    __func__, __LINE__, next->orig_line, next->orig_col, get_token_name(next->type),
-                    pc->column, pc->str.size());
-            next->column = pc->column + pc->str.size();
-            next         = next->GetNext();
+            LOG_FMT(LSPACE, "%s(%d): orig line is %zu, orig col is %zu, Skip %s (%zu+%zu)\n",
+                    __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), get_token_name(next->GetType()),
+                    pc->GetColumn(), pc->GetStr().size());
+            next->SetColumn(pc->GetColumn() + pc->GetStr().size());
+            next = next->GetNext();
          }
       }
       else
@@ -3408,9 +3346,9 @@ void space_text(void)
          Chunk *nn = next->GetNext();                                    // Issue #2734
 
          if (  nn->IsNotNullChunk()
-            && chunk_is_token(nn, CT_SPACE))
+            && nn->Is(CT_SPACE))
          {
-            chunk_del(nn); // remove the space
+            Chunk::Delete(nn); // remove the space
          }
       }
 
@@ -3418,22 +3356,21 @@ void space_text(void)
        * If the current chunk contains a newline, do not change the column
        * of the next item
        */
-      if (  chunk_is_token(pc, CT_NEWLINE)
-         || chunk_is_token(pc, CT_NL_CONT)
-         || chunk_is_token(pc, CT_COMMENT_MULTI))
+      if (  pc->IsNewline()
+         || pc->Is(CT_COMMENT_MULTI))
       {
-         column = next->column;
+         column = next->GetColumn();
       }
       else
       {
          // Set to the minimum allowed column
-         if (pc->nl_count == 0)
+         if (pc->GetNlCount() == 0)
          {
             column += pc->Len();
          }
          else
          {
-            column = pc->orig_col_end;
+            column = pc->GetOrigColEnd();
          }
          prev_column = column;
 
@@ -3444,21 +3381,21 @@ void space_text(void)
           * Two chunks -- "()" and "[]" will always tokenize differently.
           * They are always safe to not have a space after them.
           */
-         chunk_flags_clr(pc, PCF_FORCE_SPACE);
+         pc->ResetFlagBits(PCF_FORCE_SPACE);
 
          if (  (pc->Len() > 0)
-            && !chunk_is_str(pc, "[]")
-            && !chunk_is_str(pc, "{{")
-            && !chunk_is_str(pc, "}}")
-            && !chunk_is_str(pc, "()")
-            && !pc->str.startswith("@\""))
+            && !pc->IsString("[]")
+            && !pc->IsString("{{")
+            && !pc->IsString("}}")
+            && !pc->IsString("()")
+            && !pc->GetStr().startswith("@\""))
          {
             // Find the next non-empty chunk on this line
             Chunk *tmp = next;
 
             while (  tmp->IsNotNullChunk()
                   && (tmp->Len() == 0)
-                  && !chunk_is_newline(tmp))
+                  && !tmp->IsNewline())
             {
                tmp = tmp->GetNext();
             }
@@ -3466,8 +3403,8 @@ void space_text(void)
             if (  tmp->IsNotNullChunk()
                && tmp->Len() > 0)
             {
-               bool kw1 = CharTable::IsKw2(pc->str[pc->Len() - 1]);
-               bool kw2 = CharTable::IsKw1(next->str[0]);
+               bool kw1 = CharTable::IsKw2(pc->GetStr()[pc->Len() - 1]);
+               bool kw2 = CharTable::IsKw1(next->GetStr()[0]);
 
                if (  kw1
                   && kw2)
@@ -3475,7 +3412,7 @@ void space_text(void)
                   // back-to-back words need a space
                   LOG_FMT(LSPACE, "%s(%d): back-to-back words need a space: pc->Text() '%s', next->Text() '%s'\n",
                           __func__, __LINE__, pc->Text(), next->Text());
-                  chunk_flags_set(pc, PCF_FORCE_SPACE);
+                  pc->SetFlagBits(PCF_FORCE_SPACE);
                }
                // TODO:  what is the meaning of 4
                else if (  !kw1
@@ -3506,8 +3443,8 @@ void space_text(void)
                      if (  (  (  language_is_set(LANG_CPP)
                               && options::sp_permit_cpp11_shift())
                            || (language_is_set(LANG_JAVA | LANG_CS | LANG_VALA | LANG_OC)))
-                        && chunk_is_token(pc, CT_ANGLE_CLOSE)
-                        && chunk_is_token(next, CT_ANGLE_CLOSE))
+                        && pc->Is(CT_ANGLE_CLOSE)
+                        && next->Is(CT_ANGLE_CLOSE))
                      {
                         // allow '>' and '>' to become '>>'
                      }
@@ -3519,15 +3456,15 @@ void space_text(void)
                      {
                         LOG_FMT(LSPACE, "%s(%d): : pc->Text() is %s, next->Text() is %s\n",
                                 __func__, __LINE__, pc->Text(), next->Text());
-                        chunk_flags_set(pc, PCF_FORCE_SPACE);
+                        pc->SetFlagBits(PCF_FORCE_SPACE);
                      }
                   }
                }
             }
          }
          int min_sp;
-         LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, pc-Text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+         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()));
          iarf_e av = do_space_ensured(pc, next, min_sp);
          min_sp = max(1, min_sp);
 
@@ -3541,11 +3478,11 @@ void space_text(void)
          {
             int delta = min_sp;
 
-            if (  next->orig_col >= pc->orig_col_end
-               && pc->orig_col_end != 0)
+            if (  next->GetOrigCol() >= pc->GetOrigColEnd()
+               && pc->GetOrigColEnd() != 0)
             {
                // Keep the same relative spacing, minimum 1
-               delta = next->orig_col - pc->orig_col_end;
+               delta = next->GetOrigCol() - pc->GetOrigColEnd();
 
                if (delta < min_sp)
                {
@@ -3563,18 +3500,18 @@ void space_text(void)
          case IARF_IGNORE:
 
             // Keep the same relative spacing, if possible
-            if (  next->orig_col >= pc->orig_col_end
-               && pc->orig_col_end != 0)
+            if (  next->GetOrigCol() >= pc->GetOrigColEnd()
+               && pc->GetOrigColEnd() != 0)
             {
-               column += next->orig_col - pc->orig_col_end;
+               column += next->GetOrigCol() - pc->GetOrigColEnd();
             }
             else
             {
                // preserve the position if virtual brace
                // Issue #1854
-               if (chunk_is_token(pc, CT_VBRACE_OPEN))
+               if (pc->Is(CT_VBRACE_OPEN))
                {
-                  column = next->orig_col;
+                  column = next->GetOrigCol();
                }
             }
             break;
@@ -3585,8 +3522,8 @@ void space_text(void)
          } // switch
 
          if (  next->IsComment()
-            && chunk_is_newline(next->GetNext())
-            && column < next->orig_col)
+            && next->GetNext()->IsNewline()
+            && column < next->GetOrigCol())
          {
             /*
              * do some comment adjustments if sp_before_tr_cmt and sp_endif_cmt
@@ -3594,19 +3531,19 @@ void space_text(void)
              */
             // Add or remove space between #else or #endif and a trailing comment.
             if (  (  options::sp_before_tr_cmt() == IARF_IGNORE
-                  || get_chunk_parent_type(next) != CT_COMMENT_END)
+                  || next->GetParentType() != CT_COMMENT_END)
                && (  options::sp_endif_cmt() == IARF_IGNORE
-                  || (  pc->type != CT_PP_ELSE
-                     && pc->type != CT_PP_ENDIF)))
+                  || (  pc->IsNot(CT_PP_ELSE)
+                     && pc->IsNot(CT_PP_ENDIF))))
             {
                if (options::indent_relative_single_line_comments())
                {
                   // Try to keep relative spacing between tokens
                   LOG_FMT(LSPACE, "%s(%d): <relative adj>", __func__, __LINE__);
-                  LOG_FMT(LSPACE, "%s(%d): pc is '%s', pc->orig_col is %zu, next->orig_col is %zu, pc->orig_col_end is %zu\n",
+                  LOG_FMT(LSPACE, "%s(%d): pc is '%s', orig col is %zu, next orig col is %zu, pc orig col end is %zu\n",
                           __func__, __LINE__, pc->Text(),
-                          pc->orig_col, next->orig_col, pc->orig_col_end);
-                  column = pc->column + (next->orig_col - pc->orig_col_end);
+                          pc->GetOrigCol(), next->GetOrigCol(), pc->GetOrigColEnd());
+                  column = pc->GetColumn() + (next->GetOrigCol() - pc->GetOrigColEnd());
                }
                else
                {
@@ -3614,8 +3551,8 @@ void space_text(void)
                    * If there was a space, we need to force one, otherwise
                    * try to keep the comment in the same column.
                    */
-                  size_t col_min = pc->column + pc->Len() + ((next->orig_prev_sp > 0) ? 1 : 0);
-                  column = next->orig_col;
+                  size_t col_min = pc->GetColumn() + pc->Len() + ((next->GetOrigPrevSp() > 0) ? 1 : 0);
+                  column = next->GetOrigCol();
 
                   if (column < col_min)
                   {
@@ -3625,13 +3562,17 @@ void space_text(void)
                }
             }
          }
-         next->column = column;
+         next->SetColumn(column);
 
-         LOG_FMT(LSPACE, " rule = %s @ %zu => %zu\n",
+         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): ",
+                 __func__, __LINE__);
+         LOG_FMT(LSPACE, "   rule = %s @ %zu => %zu\n",
                  (av == IARF_IGNORE) ? "IGNORE" :
                  (av == IARF_ADD) ? "ADD" :
                  (av == IARF_REMOVE) ? "REMOVE" : "FORCE",
-                 column - prev_column, next->column);
+                 column - prev_column, next->GetColumn());
 
          if (restoreValues)    // guy 2015-09-22
          {
@@ -3643,13 +3584,13 @@ void space_text(void)
       if (QT_SIGNAL_SLOT_found)
       {
          // flag the chunk for a second processing
-         chunk_flags_set(pc, PCF_IN_QT_MACRO);
+         pc->SetFlagBits(PCF_IN_QT_MACRO);
       }
    }
 } // space_text
 
 
-void space_text_balance_nested_parens(void)
+void space_text_balance_nested_parens()
 {
    LOG_FUNC_ENTRY();
 
@@ -3665,30 +3606,30 @@ void space_text_balance_nested_parens(void)
       }
 
       // if there are two successive opening parenthesis
-      if (  chunk_is_str(first, "(")
-         && chunk_is_str(next, "("))
+      if (  first->IsString("(")
+         && next->IsString("("))
       {
          // insert a space between them
          space_add_after(first, 1);
 
          // test after the closing parens   Issue #1703
-         Chunk *closing = first->GetNextType((E_Token)(first->type + 1), first->level);
+         Chunk *closing = first->GetNextType((E_Token)(first->GetType() + 1), first->GetLevel());
 
-         if (closing->orig_col == closing->prev->orig_col_end)
+         if (closing->GetOrigCol() == closing->GetPrev()->GetOrigColEnd())
          {
-            space_add_after(closing->prev, 1);
+            space_add_after(closing->GetPrev(), 1);
          }
       }
-      else if (  chunk_is_str(first, ")")
-              && chunk_is_str(next, ")"))
+      else if (  first->IsString(")")
+              && next->IsString(")"))
       {
          // insert a space between the two closing parens
          space_add_after(first, 1);
 
          // test after the opening parens   Issue #1703
-         Chunk *opening = next->GetPrevType((E_Token)(next->type - 1), next->level);
+         Chunk *opening = next->GetPrevType((E_Token)(next->GetType() - 1), next->GetLevel());
 
-         if (opening->orig_col_end == opening->GetNext()->orig_col)
+         if (opening->GetOrigColEnd() == opening->GetNext()->GetOrigCol())
          {
             space_add_after(opening, 1);
          }
@@ -3716,7 +3657,7 @@ size_t space_needed(Chunk *first, Chunk *second)
 
    case IARF_IGNORE:
    default:
-      return(second->orig_col > (first->orig_col + first->Len()));
+      return(second->GetOrigCol() > (first->GetOrigCol() + first->Len()));
    }
 }
 
@@ -3725,13 +3666,13 @@ 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",
-           __func__, __LINE__, first->orig_line, first->orig_col,
-           get_token_name(first->type), get_token_name(get_chunk_parent_type(first)),
+   LOG_FMT(LSPACE, "%s(%d): first orig line is %zu, orig col is %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',",
-           __func__, __LINE__, second->orig_line, second->orig_col,
-           get_token_name(second->type), get_token_name(get_chunk_parent_type(second)),
+   LOG_FMT(LSPACE, "%s(%d): second orig line is %zu, orig col is %zu [%s/%s], Text() '%s',",
+           __func__, __LINE__, second->GetOrigLine(), second->GetOrigCol(),
+           get_token_name(second->GetType()), get_token_name(second->GetParentType()),
            second->Text());
    log_func_stack_inline(LSPACE);
 
@@ -3741,10 +3682,10 @@ 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->nl_count)
+   if (first->GetNlCount())
    {
-      LOG_FMT(LSPACE, "%s(%d):    nl_count is %zu, orig_col_end is %zu\n", __func__, __LINE__, first->nl_count, first->orig_col_end);
-      coldiff = first->orig_col_end - 1;
+      LOG_FMT(LSPACE, "%s(%d):    new line count is %zu, orig col end is %zu\n", __func__, __LINE__, first->GetNlCount(), first->GetOrigColEnd());
+      coldiff = first->GetOrigColEnd() - 1;
    }
    else
    {
@@ -3769,16 +3710,16 @@ size_t space_col_align(Chunk *first, Chunk *second)
       break;
 
    case IARF_IGNORE:                // Issue #2064
-      LOG_FMT(LSPACE, "%s(%d):    => first->orig_line  is %zu\n", __func__, __LINE__, first->orig_line);
-      LOG_FMT(LSPACE, "%s(%d):    => second->orig_line is %zu\n", __func__, __LINE__, second->orig_line);
-      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->orig_col);
-      LOG_FMT(LSPACE, "%s(%d):    => second->orig_col  is %zu\n", __func__, __LINE__, second->orig_col);
-      LOG_FMT(LSPACE, "%s(%d):    => first->Len()      is %zu\n", __func__, __LINE__, first->Len());
+      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 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());
 
-      if (  first->orig_line == second->orig_line
-         && second->orig_col > (first->orig_col + first->Len()))
+      if (  first->GetOrigLine() == second->GetOrigLine()
+         && second->GetOrigCol() > (first->GetOrigCol() + first->Len()))
       {
          coldiff++;
       }
@@ -3801,7 +3742,7 @@ void space_add_after(Chunk *pc, size_t count)
 
    // don't add at the end of the file or before a newline
    if (  next->IsNullChunk()
-      || chunk_is_newline(next))
+      || next->IsNewline())
    {
       return;
    }
@@ -3813,29 +3754,29 @@ void space_add_after(Chunk *pc, size_t count)
    }
 
    // Two CT_SPACE in a row -- use the max of the two
-   if (chunk_is_token(next, CT_SPACE))
+   if (next->Is(CT_SPACE))
    {
       if (next->Len() < count)
       {
          while (next->Len() < count)
          {
-            next->str.append(' ');
+            next->Str().append(' ');
          }
       }
       return;
    }
    Chunk sp;
 
-   set_chunk_type(&sp, CT_SPACE);
-   sp.flags = pc->flags & PCF_COPY_FLAGS;
-   sp.str   = "                ";       // 16 spaces
-   sp.str.resize(count);
-   sp.level       = pc->level;
-   sp.brace_level = pc->brace_level;
-   sp.pp_level    = pc->pp_level;
-   sp.column      = pc->column + pc->Len();
-   sp.orig_line   = pc->orig_line;
-   sp.orig_col    = pc->orig_col;
-
-   chunk_add_after(&sp, pc);
+   sp.SetType(CT_SPACE);
+   sp.SetFlags(pc->GetFlags() & PCF_COPY_FLAGS);
+   sp.Str() = "                ";         // 16 spaces
+   sp.Str().resize(count);
+   sp.SetLevel(pc->GetLevel());
+   sp.SetBraceLevel(pc->GetBraceLevel());
+   sp.SetPpLevel(pc->GetPpLevel());
+   sp.SetColumn(pc->GetColumn() + pc->Len());
+   sp.SetOrigLine(pc->GetOrigLine());
+   sp.SetOrigCol(pc->GetOrigCol());
+
+   sp.CopyAndAddAfter(pc);
 } // space_add_after
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.h
index 3989e126..275772f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.h
@@ -15,11 +15,11 @@
  * Marches through the whole file and checks to see how many spaces should be
  * between two chunks
  */
-void space_text(void);
+void space_text();
 
 
 //! Marches through the whole file and adds spaces around nested parenthesis
-void space_text_balance_nested_parens(void);
+void space_text_balance_nested_parens();
 
 
 //! Determines if a space is required between two chunks
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/symbols_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/symbols_table.h
index 1a864478..bcf7c8b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/symbols_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/symbols_table.h
@@ -8,11 +8,13 @@
 
 /**
  *
- *   Contet of the generated "punctuator_table.h" file is based off this.
+ *   Content of the generated "punctuator_table.h" file is based off this.
  *
  *   NOTE: the tables below do not need to be sorted.
  */
 
+#include "uncrustify_types.h"
+
 // 6-char symbols
 static const chunk_tag_t symbols6[] =
 {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/token_enum.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/token_enum.h
index 7a138d41..e7caa5ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/token_enum.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/token_enum.h
@@ -309,6 +309,7 @@ enum E_Token
    CT_PP_ENDIF,         // #endif
    CT_PP_ASSERT,
    CT_PP_EMIT,
+   CT_PP_ENDASM,        // end of assembly code section
    CT_PP_ENDINPUT,
    CT_PP_ERROR,
    CT_PP_FILE,
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.cpp
index 4d446f6c..0aeafe63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.cpp
@@ -382,11 +382,11 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
    ctx.save();
    int cnt;
 
-   pc.str.clear();
+   pc.Str().clear();
 
    while (ctx.peek() == '\\')
    {
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
 
       // Check for end of file
       switch (ctx.peek())
@@ -396,7 +396,7 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
 
          while (cnt--)
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
          break;
 
@@ -405,7 +405,7 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
 
          while (cnt--)
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
          break;
 
@@ -414,7 +414,7 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
 
          while (cnt--)
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
          break;
 
@@ -427,51 +427,51 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
       case '6':
       case '7':
          // handle up to 3 octal digits
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
          ch = ctx.peek();
 
          if (  (ch >= '0')
             && (ch <= '7'))
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
             ch = ctx.peek();
 
             if (  (ch >= '0')
                && (ch <= '7'))
             {
-               pc.str.append(ctx.get());
+               pc.Str().append(ctx.get());
             }
          }
          break;
 
       case '&':
          // \& NamedCharacterEntity ;
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
 
          while (unc_isalpha(ctx.peek()))
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
 
          if (ctx.peek() == ';')
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
          break;
 
       default:
          // Everything else is a single character
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
          break;
       } // switch
    }
 
-   if (pc.str.size() < 1)
+   if (pc.GetStr().size() < 1)
    {
       ctx.restore();
       return(false);
    }
-   set_chunk_type(&pc, CT_STRING);
+   pc.SetType(CT_STRING);
    return(true);
 } // d_parse_string
 
@@ -515,14 +515,14 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
    ctx.save();
 
    // account for opening two chars
-   pc.str = ctx.get();   // opening '/'
+   pc.Str() = ctx.get();   // opening '/'
    size_t ch = ctx.get();
 
-   pc.str.append(ch);    // second char
+   pc.Str().append(ch);    // second char
 
    if (ch == '/')
    {
-      set_chunk_type(&pc, CT_COMMENT_CPP);
+      pc.SetType(CT_COMMENT_CPP);
 
       while (true)
       {
@@ -547,7 +547,7 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
             {
                bs_cnt = 0;
             }
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
 
          /*
@@ -562,14 +562,14 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
 
          if (ctx.peek() == '\r')
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
 
          if (ctx.peek() == '\n')
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
-         pc.nl_count++;
+         pc.SetNlCount(pc.GetNlCount() + 1);
          cpd.did_newline = true;
       }
    }
@@ -581,7 +581,7 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
    }
    else if (ch == '+')
    {
-      set_chunk_type(&pc, CT_COMMENT);
+      pc.SetType(CT_COMMENT);
       d_level++;
 
       while (  d_level > 0
@@ -590,8 +590,8 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
          if (  (ctx.peek() == '+')
             && (ctx.peek(1) == '/'))
          {
-            pc.str.append(ctx.get());  // store the '+'
-            pc.str.append(ctx.get());  // store the '/'
+            pc.Str().append(ctx.get());  // store the '+'
+            pc.Str().append(ctx.get());  // store the '/'
             d_level--;
             continue;
          }
@@ -599,26 +599,26 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
          if (  (ctx.peek() == '/')
             && (ctx.peek(1) == '+'))
          {
-            pc.str.append(ctx.get());  // store the '/'
-            pc.str.append(ctx.get());  // store the '+'
+            pc.Str().append(ctx.get());  // store the '/'
+            pc.Str().append(ctx.get());  // store the '+'
             d_level++;
             continue;
          }
          ch = ctx.get();
-         pc.str.append(ch);
+         pc.Str().append(ch);
 
          if (  (ch == '\n')
             || (ch == '\r'))
          {
-            set_chunk_type(&pc, CT_COMMENT_MULTI);
-            pc.nl_count++;
+            pc.SetType(CT_COMMENT_MULTI);
+            pc.SetNlCount(pc.GetNlCount() + 1);
 
             if (ch == '\r')
             {
                if (ctx.peek() == '\n')
                {
                   ++LE_COUNT(CRLF);
-                  pc.str.append(ctx.get());  // store the '\n'
+                  pc.Str().append(ctx.get());  // store the '\n'
                }
                else
                {
@@ -634,25 +634,25 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
    }
    else  // must be '/ *'
    {
-      set_chunk_type(&pc, CT_COMMENT);
+      pc.SetType(CT_COMMENT);
 
       while (ctx.more())
       {
          if (  (ctx.peek() == '*')
             && (ctx.peek(1) == '/'))
          {
-            pc.str.append(ctx.get());  // store the '*'
-            pc.str.append(ctx.get());  // store the '/'
+            pc.Str().append(ctx.get());  // store the '*'
+            pc.Str().append(ctx.get());  // store the '/'
 
             tok_info ss;
             ctx.save(ss);
-            size_t   oldsize = pc.str.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'))
             {
-               pc.str.append(ctx.get());
+               pc.Str().append(ctx.get());
             }
 
             if (  (ctx.peek() != '/')
@@ -660,25 +660,25 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
             {
                // undo the attempt to join
                ctx.restore(ss);
-               pc.str.resize(oldsize);
+               pc.Str().resize(oldsize);
                break;
             }
          }
          ch = ctx.get();
-         pc.str.append(ch);
+         pc.Str().append(ch);
 
          if (  (ch == '\n')
             || (ch == '\r'))
          {
-            set_chunk_type(&pc, CT_COMMENT_MULTI);
-            pc.nl_count++;
+            pc.SetType(CT_COMMENT_MULTI);
+            pc.SetNlCount(pc.GetNlCount() + 1);
 
             if (ch == '\r')
             {
                if (ctx.peek() == '\n')
                {
                   ++LE_COUNT(CRLF);
-                  pc.str.append(ctx.get());  // store the '\n'
+                  pc.Str().append(ctx.get());  // store the '\n'
                }
                else
                {
@@ -695,20 +695,20 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
 
    if (cpd.unc_off)
    {
-      bool found_enable_marker = (find_enable_processing_comment_marker(pc.str) >= 0);
+      bool found_enable_marker = (find_enable_processing_comment_marker(pc.GetStr()) >= 0);
 
       if (found_enable_marker)
       {
          const auto &ontext = options::enable_processing_cmt();
 
          LOG_FMT(LBCTRL, "%s(%d): Found '%s' on line %zu\n",
-                 __func__, __LINE__, ontext.c_str(), pc.orig_line);
+                 __func__, __LINE__, ontext.c_str(), pc.GetOrigLine());
          cpd.unc_off = false;
       }
    }
    else
    {
-      auto position_disable_processing_cmt = find_disable_processing_comment_marker(pc.str);
+      auto position_disable_processing_cmt = find_disable_processing_comment_marker(pc.GetStr());
       bool found_disable_marker            = (position_disable_processing_cmt >= 0);
 
       if (found_disable_marker)
@@ -718,14 +718,14 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
           * in which case we'll handle at a late time. Check to see if processing
           * is re-enabled elsewhere in this comment
           */
-         auto position_enable_processing_cmt = find_enable_processing_comment_marker(pc.str);
+         auto position_enable_processing_cmt = find_enable_processing_comment_marker(pc.GetStr());
 
          if (position_enable_processing_cmt < position_disable_processing_cmt)
          {
             const auto &offtext = options::disable_processing_cmt();
 
             LOG_FMT(LBCTRL, "%s(%d): Found '%s' on line %zu\n",
-                    __func__, __LINE__, offtext.c_str(), pc.orig_line);
+                    __func__, __LINE__, offtext.c_str(), pc.GetOrigLine());
             cpd.unc_off = true;
             // Issue #842
             cpd.unc_off_used = true;
@@ -746,8 +746,8 @@ static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc)
    ctx.save();
 
    // account for opening two chars '<#'
-   pc.str = ctx.get();
-   pc.str.append(ctx.get());
+   pc.Str() = ctx.get();
+   pc.Str().append(ctx.get());
 
    // grab everything until '#>', fail if not found.
    size_t last1 = 0;
@@ -756,12 +756,12 @@ static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc)
    {
       size_t last2 = last1;
       last1 = ctx.get();
-      pc.str.append(last1);
+      pc.Str().append(last1);
 
       if (  (last2 == '#')
          && (last1 == '>'))
       {
-         set_chunk_type(&pc, CT_WORD);
+         pc.SetType(CT_WORD);
          return(true);
       }
    }
@@ -775,7 +775,7 @@ static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring = false)
    if (CharTable::IsKw1(ctx.peek()))
    {
       size_t slen    = 0;
-      size_t oldsize = pc.str.size();
+      size_t oldsize = pc.GetStr().size();
 
       // don't add the suffix if we see L" or L' or S"
       size_t p1 = ctx.peek();
@@ -797,16 +797,16 @@ static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring = false)
             && CharTable::IsKw2(ctx.peek()))
       {
          slen++;
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
 
       if (  forstring
          && slen >= 4
-         && (  pc.str.startswith("PRI", oldsize)
-            || pc.str.startswith("SCN", oldsize)))
+         && (  pc.GetStr().startswith("PRI", oldsize)
+            || pc.GetStr().startswith("SCN", oldsize)))
       {
          ctx.restore(ss);
-         pc.str.resize(oldsize);
+         pc.Str().resize(oldsize);
       }
    }
 }
@@ -910,8 +910,8 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
       size_t ch;
       Chunk  pc_temp;
 
-      pc.str.append(ctx.get());  // store the '0'
-      pc_temp.str.append('0');
+      pc.Str().append(ctx.get());  // store the '0'
+      pc_temp.Str().append('0');
 
       // MS constant might have an "h" at the end. Look for it
       ctx.save();
@@ -920,9 +920,9 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
             && CharTable::IsKw2(ctx.peek()))
       {
          ch = ctx.get();
-         pc_temp.str.append(ch);
+         pc_temp.Str().append(ch);
       }
-      ch = pc_temp.str[pc_temp.Len() - 1];
+      ch = pc_temp.GetStr()[pc_temp.Len() - 1];
       ctx.restore();
       LOG_FMT(LGUY, "%s(%d): pc_temp:%s\n", __func__, __LINE__, pc_temp.Text());
 
@@ -934,10 +934,10 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
 
          do
          {
-            pc.str.append(ctx.get()); // store the rest
+            pc.Str().append(ctx.get()); // store the rest
          } while (is_hex_(ctx.peek()));
 
-         pc.str.append(ctx.get());    // store the h
+         pc.Str().append(ctx.get());    // store the h
          LOG_FMT(LGUY, "%s(%d): pc:%s\n", __func__, __LINE__, pc.Text());
       }
       else
@@ -949,7 +949,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
 
             do
             {
-               pc.str.append(ctx.get());  // store the 'x' and then the rest
+               pc.Str().append(ctx.get());  // store the 'x' and then the rest
             } while (is_hex_(ctx.peek()));
 
             break;
@@ -958,7 +958,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
 
             do
             {
-               pc.str.append(ctx.get());  // store the 'b' and then the rest
+               pc.Str().append(ctx.get());  // store the 'b' and then the rest
             } while (is_bin_(ctx.peek()));
 
             break;
@@ -976,7 +976,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
 
             do
             {
-               pc.str.append(ctx.get());
+               pc.Str().append(ctx.get());
             } while (is_oct_(ctx.peek()));
 
             break;
@@ -992,7 +992,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
       // Regular int or float
       while (is_dec_(ctx.peek()))
       {
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
    }
 
@@ -1014,28 +1014,28 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
       if (ctx.peek(1) == '(')
       {
          ctx.restore(ss);
-         set_chunk_type(&pc, CT_NUMBER);
+         pc.SetType(CT_NUMBER);
          return(true);
       }
       else
       {
          ctx.restore(ss);
       }
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
       is_float = true;
 
       if (did_hex)
       {
          while (is_hex_(ctx.peek()))
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
       }
       else
       {
          while (is_dec_(ctx.peek()))
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
       }
    }
@@ -1051,17 +1051,17 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
       || (tmp == 'P'))
    {
       is_float = true;
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
 
       if (  (ctx.peek() == '+')
          || (ctx.peek() == '-'))
       {
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
 
       while (is_dec_(ctx.peek()))
       {
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
    }
 
@@ -1093,7 +1093,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
       {
          break;
       }
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
 
    // skip the Microsoft-specific '32' and '64' suffix
@@ -1102,10 +1102,10 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
       || (  (ctx.peek() == '6')
          && (ctx.peek(1) == '4')))
    {
-      pc.str.append(ctx.get());
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
+      pc.Str().append(ctx.get());
    }
-   set_chunk_type(&pc, is_float ? CT_NUMBER_FP : CT_NUMBER);
+   pc.SetType(is_float ? CT_NUMBER_FP : CT_NUMBER);
 
    /*
     * If there is anything left, then we are probably dealing with garbage or
@@ -1130,16 +1130,16 @@ static bool parse_string(tok_ctx &ctx, Chunk &pc, size_t quote_idx, bool allow_e
                                    && options::string_replace_tab_chars()
                                    && language_is_set(LANG_ALLC));
 
-   pc.str.clear();
+   pc.Str().clear();
 
    while (quote_idx-- > 0)
    {
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
-   set_chunk_type(&pc, CT_STRING);
+   pc.SetType(CT_STRING);
    const size_t termination_character = CharTable::Get(ctx.peek()) & 0xff;
 
-   pc.str.append(ctx.get());                          // store the "
+   pc.Str().append(ctx.get());                          // store the "
 
    bool escaped = false;
 
@@ -1153,23 +1153,23 @@ static bool parse_string(tok_ctx &ctx, Chunk &pc, size_t quote_idx, bool allow_e
       {
          const size_t lastcol = ctx.c.col - 1;
          ctx.c.col = lastcol + 2;
-         pc.str.append(escape_char);
-         pc.str.append('t');
+         pc.Str().append(escape_char);
+         pc.Str().append('t');
          continue;
       }
-      pc.str.append(ch);
+      pc.Str().append(ch);
 
       if (ch == '\n')
       {
-         pc.nl_count++;
-         set_chunk_type(&pc, CT_STRING_MULTI);
+         pc.SetNlCount(pc.GetNlCount() + 1);
+         pc.SetType(CT_STRING_MULTI);
       }
       else if (  ch == '\r'
               && ctx.peek() != '\n')
       {
-         pc.str.append(ctx.get());
-         pc.nl_count++;
-         set_chunk_type(&pc, CT_STRING_MULTI);
+         pc.Str().append(ctx.get());
+         pc.SetNlCount(pc.GetNlCount() + 1);
+         pc.SetType(CT_STRING_MULTI);
       }
 
       // if last char in prev loop was escaped the one in the current loop isn't
@@ -1240,11 +1240,11 @@ static cs_string_t parse_cs_string_start(tok_ctx &ctx, Chunk &pc)
    {
       stringType |= CS_STRING_STRING;
 
-      set_chunk_type(&pc, CT_STRING);
+      pc.SetType(CT_STRING);
 
       for (int i = 0; i <= offset; ++i)
       {
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
    }
    else
@@ -1301,11 +1301,11 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
 
          if (ctx.peek() == '}')
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
 
             if (ctx.peek() == '}')
             {
-               pc.str.append(ctx.get()); // in interpolated string, `}}` is escape'd `}`
+               pc.Str().append(ctx.get()); // in interpolated string, `}}` is escape'd `}`
             }
             else
             {
@@ -1324,16 +1324,16 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
       int lastcol = ctx.c.col;
       int ch      = ctx.get();
 
-      pc.str.append(ch);
+      pc.Str().append(ch);
 
       if (ch == '\n')
       {
-         set_chunk_type(&pc, CT_STRING_MULTI);
-         pc.nl_count++;
+         pc.SetType(CT_STRING_MULTI);
+         pc.SetNlCount(pc.GetNlCount() + 1);
       }
       else if (ch == '\r')
       {
-         set_chunk_type(&pc, CT_STRING_MULTI);
+         pc.SetType(CT_STRING_MULTI);
       }
       else if (parseState.top().braceDepth > 0)
       {
@@ -1355,22 +1355,22 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
                 * a tab char can't be replaced with \\t because escapes don't
                 * work in here-strings. best we can do is warn.
                 */
-               LOG_FMT(warnlevel, "%s(%d): %s: orig_line is %zu, orig_col is %zu, Detected non-replaceable tab char in literal string\n",
-                       __func__, __LINE__, cpd.filename.c_str(), pc.orig_line, pc.orig_col);
+               LOG_FMT(warnlevel, "%s(%d): %s: orig line is %zu, orig col is %zu, Detected non-replaceable tab char in literal string\n",
+                       __func__, __LINE__, cpd.filename.c_str(), pc.GetOrigLine(), pc.GetOrigCol());
                LOG_FMT(warnlevel, "%s(%d): Warning is given if doing tab-to-\\t replacement and we have found one in a C# verbatim string literal.\n",
                        __func__, __LINE__);
 
                if (warnlevel < LWARN)
                {
-                  cpd.error_count++;
+                  // TODO: replace the code ?? cpd.error_count++;
                }
             }
          }
          else
          {
             ctx.c.col = lastcol + 2;
-            pc.str.pop_back(); // remove \t
-            pc.str.append("\\t");
+            pc.Str().pop_back(); // remove \t
+            pc.Str().append("\\t");
 
             continue;
          }
@@ -1382,7 +1382,7 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
          if (  ctx.peek() == '"'
             || ctx.peek() == '\\')
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
       }
       else if (ch == '"')
@@ -1391,7 +1391,7 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
             && (ctx.peek() == '"'))
          {
             // in verbatim string, `""` is escape'd `"`
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
          else
          {
@@ -1410,7 +1410,7 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
          {
             if (ctx.peek() == '{')
             {
-               pc.str.append(ctx.get()); // in interpolated string, `{{` is escape'd `{`
+               pc.Str().append(ctx.get()); // in interpolated string, `{{` is escape'd `{`
             }
             else
             {
@@ -1425,33 +1425,33 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
 
 static void parse_verbatim_string(tok_ctx &ctx, Chunk &pc)
 {
-   set_chunk_type(&pc, CT_STRING);
+   pc.SetType(CT_STRING);
 
    // consume the initial """
-   pc.str = ctx.get();
-   pc.str.append(ctx.get());
-   pc.str.append(ctx.get());
+   pc.Str() = ctx.get();
+   pc.Str().append(ctx.get());
+   pc.Str().append(ctx.get());
 
    // go until we hit a zero (end of file) or a """
    while (ctx.more())
    {
       size_t ch = ctx.get();
-      pc.str.append(ch);
+      pc.Str().append(ch);
 
       if (  (ch == '"')
          && (ctx.peek() == '"')
          && (ctx.peek(1) == '"'))
       {
-         pc.str.append(ctx.get());
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
+         pc.Str().append(ctx.get());
          break;
       }
 
       if (  (ch == '\n')
          || (ch == '\r'))
       {
-         set_chunk_type(&pc, CT_STRING_MULTI);
-         pc.nl_count++;
+         pc.SetType(CT_STRING_MULTI);
+         pc.SetNlCount(pc.GetNlCount() + 1);
       }
    }
 }
@@ -1481,12 +1481,12 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
    ctx.save();
 
    // Copy the prefix + " to the string
-   pc.str.clear();
+   pc.Str().clear();
    int cnt = q_idx + 1;
 
    while (cnt--)
    {
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
 
    // Add the tag and get the length of the tag
@@ -1494,7 +1494,7 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
          && (ctx.peek() != '('))
    {
       tag_len++;
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
 
    if (ctx.peek() != '(')
@@ -1502,7 +1502,7 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
       ctx.restore();
       return(false);
    }
-   set_chunk_type(&pc, CT_STRING);
+   pc.SetType(CT_STRING);
 
    while (ctx.more())
    {
@@ -1514,7 +1514,7 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
 
          while (cnt--)
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
          parse_suffix(ctx, pc);
          return(true);
@@ -1522,13 +1522,13 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
 
       if (ctx.peek() == '\n')
       {
-         pc.str.append(ctx.get());
-         pc.nl_count++;
-         set_chunk_type(&pc, CT_STRING_MULTI);
+         pc.Str().append(ctx.get());
+         pc.SetNlCount(pc.GetNlCount() + 1);
+         pc.SetType(CT_STRING_MULTI);
       }
       else
       {
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
    }
    ctx.restore();
@@ -1548,8 +1548,8 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
    static unc_text intr_txt("@interface");
 
    // The first character is already valid
-   pc.str.clear();
-   pc.str.append(ctx.get());
+   pc.Str().clear();
+   pc.Str().append(ctx.get());
 
    while (ctx.more())
    {
@@ -1557,13 +1557,13 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
 
       if (CharTable::IsKw2(ch))
       {
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
       else if (  (ch == '\\')
               && (unc_tolower(ctx.peek(1)) == 'u'))
       {
-         pc.str.append(ctx.get());
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
+         pc.Str().append(ctx.get());
          skipcheck = true;
       }
       else
@@ -1577,7 +1577,7 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
          skipcheck = true;
       }
    }
-   set_chunk_type(&pc, CT_WORD);
+   pc.SetType(CT_WORD);
 
    if (skipcheck)
    {
@@ -1590,11 +1590,11 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
    {
       if (ctx.peek() == '(')
       {
-         set_chunk_type(&pc, CT_MACRO_FUNC);
+         pc.SetType(CT_MACRO_FUNC);
       }
       else
       {
-         set_chunk_type(&pc, CT_MACRO);
+         pc.SetType(CT_MACRO);
 
          log_rule_B("pp_ignore_define_body");
 
@@ -1612,28 +1612,28 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
    {
       // '@interface' is reserved, not an interface itself
       if (  language_is_set(LANG_JAVA)
-         && pc.str.startswith("@")
-         && !pc.str.equals(intr_txt))
+         && pc.GetStr().startswith("@")
+         && !pc.GetStr().equals(intr_txt))
       {
-         set_chunk_type(&pc, CT_ANNOTATION);
+         pc.SetType(CT_ANNOTATION);
       }
       else
       {
          // Turn it into a keyword now
          // Issue #1460 will return "COMMENT_CPP"
-         set_chunk_type(&pc, find_keyword_type(pc.Text(), pc.str.size()));
+         pc.SetType(find_keyword_type(pc.Text(), pc.GetStr().size()));
 
          /* Special pattern: if we're trying to redirect a preprocessor directive to PP_IGNORE,
           * then ensure we're actually part of a preprocessor before doing the swap, or we'll
           * end up with a function named 'define' as PP_IGNORE. This is necessary because with
           * the config 'set' feature, there's no way to do a pair of tokens as a word
           * substitution. */
-         if (  pc.type == CT_PP_IGNORE
+         if (  pc.GetType() == CT_PP_IGNORE
             && !cpd.in_preproc)
          {
-            set_chunk_type(&pc, find_keyword_type(pc.Text(), pc.str.size()));
+            pc.SetType(find_keyword_type(pc.Text(), pc.GetStr().size()));
          }
-         else if (pc.type == CT_COMMENT_CPP)   // Issue #1460
+         else if (pc.GetType() == CT_COMMENT_CPP)   // Issue #1460
          {
             size_t ch;
             bool   is_cs = language_is_set(LANG_CS);
@@ -1662,7 +1662,7 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
                   {
                      bs_cnt = 0;
                   }
-                  pc.str.append(ctx.get());
+                  pc.Str().append(ctx.get());
                }
 
                /*
@@ -1677,18 +1677,18 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
 
                if (ctx.peek() == '\r')
                {
-                  pc.str.append(ctx.get());
+                  pc.Str().append(ctx.get());
                }
 
                if (ctx.peek() == '\n')
                {
-                  pc.str.append(ctx.get());
+                  pc.Str().append(ctx.get());
                }
-               pc.nl_count++;
+               pc.SetNlCount(pc.GetNlCount() + 1);
                cpd.did_newline = true;
             }
             // Store off the end column
-            pc.orig_col_end = ctx.c.col;
+            pc.SetOrigColEnd(ctx.c.col);
          }
       }
    }
@@ -1777,13 +1777,13 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
 
 static bool extract_attribute_specifier_sequence(tok_ctx &ctx, Chunk &pc, size_t length)
 {
-   pc.str.clear();
+   pc.Str().clear();
 
    while (length--)
    {
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
-   set_chunk_type(&pc, CT_ATTRIBUTE);
+   pc.SetType(CT_ATTRIBUTE);
    return(true);
 } // extract_attribute_specifier_sequence
 
@@ -1797,6 +1797,7 @@ static bool parse_whitespace(tok_ctx &ctx, Chunk &pc)
    while (  ctx.more()
          && unc_isspace(ctx.peek()))
    {
+      int lastcol = ctx.c.col;
       ch = ctx.get();   // throw away the whitespace char
 
       switch (ch)
@@ -1814,23 +1815,22 @@ static bool parse_whitespace(tok_ctx &ctx, Chunk &pc)
             ++LE_COUNT(CR);
          }
          nl_count++;
-         pc.orig_prev_sp = 0;
+         pc.SetOrigPrevSp(0);
          break;
 
       case '\n':
          // LF ending
          ++LE_COUNT(LF);
          nl_count++;
-         pc.orig_prev_sp = 0;
+         pc.SetOrigPrevSp(0);
          break;
 
       case '\t':
-         log_rule_B("input_tab_size");
-         pc.orig_prev_sp += calc_next_tab_column(cpd.column, options::input_tab_size()) - cpd.column;
+         pc.SetOrigPrevSp(pc.GetOrigPrevSp() + ctx.c.col - lastcol);
          break;
 
       case ' ':
-         pc.orig_prev_sp++;
+         pc.SetOrigPrevSp(pc.GetOrigPrevSp() + 1);
          break;
 
       default:
@@ -1840,10 +1840,10 @@ static bool parse_whitespace(tok_ctx &ctx, Chunk &pc)
 
    if (ch != 0)
    {
-      pc.str.clear();
-      set_chunk_type(&pc, nl_count ? CT_NEWLINE : CT_WHITESPACE);
-      pc.nl_count  = nl_count;
-      pc.after_tab = (ctx.c.last_ch == '\t');
+      pc.Str().clear();
+      pc.SetType(nl_count ? CT_NEWLINE : CT_WHITESPACE);
+      pc.SetNlCount(nl_count);
+      pc.SetAfterTab((ctx.c.last_ch == '\t'));
       return(true);
    }
    return(false);
@@ -1869,9 +1869,9 @@ static bool parse_bs_newline(tok_ctx &ctx, Chunk &pc)
          {
             ctx.expect('\n');
          }
-         set_chunk_type(&pc, CT_NL_CONT);
-         pc.str      = "\\";
-         pc.nl_count = 1;
+         pc.SetType(CT_NL_CONT);
+         pc.Str() = "\\";
+         pc.SetNlCount(1);
          return(true);
       }
    }
@@ -1908,8 +1908,8 @@ static bool parse_newline(tok_ctx &ctx)
 
 static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt)
 {
-   pc.str.clear();
-   set_chunk_type(&pc, tt);
+   pc.Str().clear();
+   pc.SetType(tt);
 
    while (!unc_isspace(ctx.peek()))
    {
@@ -1924,7 +1924,7 @@ static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt)
             break;
          }
       }
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
 }
 
@@ -1941,8 +1941,8 @@ static bool parse_off_newlines(tok_ctx &ctx, Chunk &pc)
 
    if (nl_count > 0)
    {
-      pc.nl_count = nl_count;
-      set_chunk_type(&pc, CT_NEWLINE);
+      pc.SetNlCount(nl_count);
+      pc.SetType(CT_NEWLINE);
       return(true);
    }
    return(false);
@@ -1961,10 +1961,14 @@ static bool parse_macro(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       return(true);
    }
    ctx.save();
-   pc.str.clear();
+   pc.Str().clear();
 
-   bool continued = (  chunk_is_token(prev_pc, CT_NL_CONT)
-                    || chunk_is_token(prev_pc, CT_COMMENT_MULTI));
+   if (prev_pc == nullptr)
+   {
+      return(false);
+   }
+   bool continued = (  prev_pc->Is(CT_NL_CONT)
+                    || prev_pc->Is(CT_COMMENT_MULTI));
 
    while (ctx.more())
    {
@@ -1978,18 +1982,18 @@ static bool parse_macro(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       if (  (  nl_cont
             || (  continued
                && nl))
-         && pc.str.size() > 0)
+         && pc.GetStr().size() > 0)
       {
-         set_chunk_type(&pc, CT_IGNORED);
+         pc.SetType(CT_PP_IGNORE);
          return(true);
       }
       else if (nl)
       {
          break;
       }
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
-   pc.str.clear();
+   pc.Str().clear();
    ctx.restore();
    return(false);
 } // parse_macro
@@ -2003,31 +2007,31 @@ static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
    }
    // See if the UO_enable_processing_cmt or #pragma endasm / #endasm text is on this line
    ctx.save();
-   pc.str.clear();
+   pc.Str().clear();
 
    while (  ctx.more()
          && (ctx.peek() != '\r')
          && (ctx.peek() != '\n'))
    {
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
 
-   if (pc.str.size() == 0)
+   if (pc.GetStr().size() == 0)
    {
       // end of file?
       return(false);
    }
 
    // HACK: turn on if we find '#endasm' or '#pragma' and 'endasm' separated by blanks
-   if (  (  (  (pc.str.find("#pragma ") >= 0)
-            || (pc.str.find("#pragma	") >= 0))
-         && (  (pc.str.find(" endasm") >= 0)
-            || (pc.str.find("	endasm") >= 0)))
-      || (pc.str.find("#endasm") >= 0))
+   if (  (  (  (pc.GetStr().find("#pragma ") >= 0)
+            || (pc.GetStr().find("#pragma	") >= 0))
+         && (  (pc.GetStr().find(" endasm") >= 0)
+            || (pc.GetStr().find("	endasm") >= 0)))
+      || (pc.GetStr().find("#endasm") >= 0))
    {
       cpd.unc_off = false;
       ctx.restore();
-      pc.str.clear();
+      pc.Str().clear();
       return(false);
    }
    // Note that we aren't actually making sure this is in a comment, yet
@@ -2041,8 +2045,8 @@ static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
       if (  ontext != UNCRUSTIFY_ON_TEXT
          && options::processing_cmt_as_regex())
       {
-         std::wstring pc_wstring(pc.str.get().cbegin(),
-                                 pc.str.get().cend());
+         std::wstring pc_wstring(pc.GetStr().get().cbegin(),
+                                 pc.GetStr().get().cend());
          std::wregex  criteria(std::wstring(ontext.cbegin(),
                                             ontext.cend()));
 
@@ -2052,12 +2056,12 @@ static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
       }
       else
       {
-         found_enable_pattern = (pc.str.find(ontext.c_str()) >= 0);
+         found_enable_pattern = (pc.GetStr().find(ontext.c_str()) >= 0);
       }
 
       if (!found_enable_pattern)
       {
-         set_chunk_type(&pc, CT_IGNORED);
+         pc.SetType(CT_IGNORED);
          return(true);
       }
    }
@@ -2066,7 +2070,7 @@ static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
    // parse off whitespace leading to the comment
    if (parse_whitespace(ctx, pc))
    {
-      set_chunk_type(&pc, CT_IGNORED);
+      pc.SetType(CT_IGNORED);
       return(true);
    }
 
@@ -2077,18 +2081,18 @@ static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
       return(true);
    }
    // Reset the chunk & scan to until a newline
-   pc.str.clear();
+   pc.Str().clear();
 
    while (  ctx.more()
          && (ctx.peek() != '\r')
          && (ctx.peek() != '\n'))
    {
-      pc.str.append(ctx.get());
+      pc.Str().append(ctx.get());
    }
 
-   if (pc.str.size() > 0)
+   if (pc.GetStr().size() > 0)
    {
-      set_chunk_type(&pc, CT_IGNORED);
+      pc.SetType(CT_IGNORED);
       return(true);
    }
    return(false);
@@ -2102,12 +2106,12 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       return(false);
    }
    // Save off the current column
-   set_chunk_type(&pc, CT_NONE);
-   pc.orig_line = ctx.c.row;
-   pc.column    = ctx.c.col;
-   pc.orig_col  = ctx.c.col;
-   pc.nl_count  = 0;
-   pc.flags     = PCF_NONE;
+   pc.SetType(CT_NONE);
+   pc.SetOrigLine(ctx.c.row);
+   pc.SetColumn(ctx.c.col);
+   pc.SetOrigCol(ctx.c.col);
+   pc.SetNlCount(0);
+   pc.SetFlags(PCF_NONE);
 
    // If it is turned off, we put everything except newlines into CT_UNKNOWN
    if (cpd.unc_off)
@@ -2138,11 +2142,11 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
    if (  cpd.in_preproc > CT_PP_BODYCHUNK
       && cpd.in_preproc <= CT_PP_OTHER)
    {
-      pc.str.clear();
+      pc.Str().clear();
       tok_info ss;
       ctx.save(ss);
       // Chunk to a newline or comment
-      set_chunk_type(&pc, CT_PREPROC_BODY);
+      pc.SetType(CT_PREPROC_BODY);
       size_t last = 0;
 
       while (ctx.more())
@@ -2165,7 +2169,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
             if (last == '\\')
             {
                ctx.restore(ss);
-               pc.str.pop_back();
+               pc.Str().pop_back();
             }
             break;
          }
@@ -2180,10 +2184,10 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
          last = ch;
          ctx.save(ss);
 
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
 
-      if (pc.str.size() > 0)
+      if (pc.GetStr().size() > 0)
       {
          return(true);
       }
@@ -2214,10 +2218,16 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       {
          return(true);
       }
+   }
 
+   if (language_is_set(LANG_CS | LANG_VALA))
+   {
       // check for non-keyword identifiers such as @if @switch, etc
-      if (  (ctx.peek() == '@')
-         && CharTable::IsKw1(ctx.peek(1)))
+      // Vala also allows numeric identifiers if prefixed with '@'
+      if (  ctx.peek() == '@'
+         && (  CharTable::IsKw1(ctx.peek(1))
+            || (  language_is_set(LANG_VALA)
+               && CharTable::IsKw2(ctx.peek(1)))))
       {
          parse_word(ctx, pc, true);
          return(true);
@@ -2318,10 +2328,10 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
          && (ctx.peek() == '%')
          && unc_isdigit(ctx.peek(1)))
       {
-         pc.str.clear();
-         pc.str.append(ctx.get());
-         pc.str.append(ctx.get());
-         set_chunk_type(&pc, CT_WORD);
+         pc.Str().clear();
+         pc.Str().append(ctx.get());
+         pc.Str().append(ctx.get());
+         pc.SetType(CT_WORD);
          return(true);
       }
    }
@@ -2360,14 +2370,18 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
             && cpd.in_preproc == CT_PP_INCLUDE))
       {
          parse_string(ctx, pc, unc_isalpha(ch) ? 1 : 0, true);
-         set_chunk_parent(&pc, CT_PP_INCLUDE);
+
+         if (cpd.in_preproc == CT_PP_INCLUDE)
+         {
+            pc.SetParentType(CT_PP_INCLUDE);
+         }
          return(true);
       }
 
       if (  (ch == '<')
          && cpd.in_preproc == CT_PP_DEFINE)
       {
-         if (chunk_is_token(Chunk::GetTail(), CT_MACRO))
+         if (Chunk::GetTail()->Is(CT_MACRO))
          {
             // We have "#define XXX <", assume '<' starts an include string
             parse_string(ctx, pc, 0, false);
@@ -2379,16 +2393,30 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
       if (  (ch == '(')
          && (tail->IsNotNullChunk())
-         && (  chunk_is_token(tail, CT_CNG_HASINC)
-            || chunk_is_token(tail, CT_CNG_HASINCN)))
+         && (  tail->Is(CT_CNG_HASINC)
+            || tail->Is(CT_CNG_HASINCN)))
       {
          parse_string(ctx, pc, 0, false);
          return(true);
       }
    }
 
-   // Check for Objective C literals and VALA identifiers ('@1', '@if')
-   if (  language_is_set(LANG_OC | LANG_VALA)
+   // Check for Vala string templates
+   if (  language_is_set(LANG_VALA)
+      && (ctx.peek() == '@'))
+   {
+      size_t nc = ctx.peek(1);
+
+      if (nc == '"')
+      {
+         // literal string
+         parse_string(ctx, pc, 1, true);
+         return(true);
+      }
+   }
+
+   // Check for Objective C literals
+   if (  language_is_set(LANG_OC)
       && (ctx.peek() == '@'))
    {
       size_t nc = ctx.peek(1);
@@ -2419,7 +2447,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
          && (nc <= '9'))
       {
          // literal number
-         pc.str.append(ctx.get());  // store the '@'
+         pc.Str().append(ctx.get());  // store the '@'
          parse_number(ctx, pc);
          return(true);
       }
@@ -2441,7 +2469,8 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       && ctx.peek() == '[')
    {
       if (  !language_is_set(LANG_OC)
-         || !chunk_is_token(prev_pc, CT_OC_AT))
+         || (  prev_pc != nullptr
+            && !prev_pc->Is(CT_OC_AT)))
       {
          if (auto length = parse_attribute_specifier_sequence(ctx))
          {
@@ -2468,10 +2497,10 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
       while (cnt--)
       {
-         pc.str.append(ctx.get());
+         pc.Str().append(ctx.get());
       }
-      set_chunk_type(&pc, punc->type);
-      pc.flags |= PCF_PUNCTUATOR;
+      pc.SetType(punc->type);
+      pc.SetFlagBits(PCF_PUNCTUATOR);
       return(true);
    }
    /* When parsing C/C++ files and running into some unknown token,
@@ -2487,28 +2516,27 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
    if (probe_lang_flags != 0)
    {
-      if ((punc = find_punctuator(punc_txt, probe_lang_flags)) != NULL)
+      if ((punc = find_punctuator(punc_txt, probe_lang_flags)) != nullptr)
       {
          cpd.lang_flags = probe_lang_flags;
          int cnt = strlen(punc->tag);
 
          while (cnt--)
          {
-            pc.str.append(ctx.get());
+            pc.Str().append(ctx.get());
          }
-         set_chunk_type(&pc, punc->type);
-         pc.flags |= PCF_PUNCTUATOR;
+         pc.SetType(punc->type);
+         pc.SetFlagBits(PCF_PUNCTUATOR);
          return(true);
       }
    }
    // throw away this character
-   set_chunk_type(&pc, CT_UNKNOWN);
-   pc.str.append(ctx.get());
+   pc.SetType(CT_UNKNOWN);
+   pc.Str().append(ctx.get());
 
    LOG_FMT(LWARN, "%s:%zu Garbage in col %zu: %x\n",
-           cpd.filename.c_str(), pc.orig_line, ctx.c.col, pc.str[0]);
-   cpd.error_count++;
-   return(true);
+           cpd.filename.c_str(), pc.GetOrigLine(), ctx.c.col, pc.GetStr()[0]);
+   exit(EX_SOFTWARE);
 } // parse_next
 
 
@@ -2636,120 +2664,121 @@ void tokenize(const deque<int> &data, Chunk *ref)
    while (ctx.more())
    {
       chunk.Reset();
-      chunk.pp_level = 0;
+      chunk.SetPpLevel(0);
 
       if (!parse_next(ctx, chunk, pc))
       {
          LOG_FMT(LERR, "%s:%zu Bailed before the end?\n",
                  cpd.filename.c_str(), ctx.c.row);
-         cpd.error_count++;
-         break;
+         exit(EX_SOFTWARE);
       }
 
       if (  language_is_set(LANG_JAVA)
-         && chunk.type == CT_MEMBER
+         && chunk.GetType() == CT_MEMBER
          && !memcmp(chunk.Text(), "->", 2))
       {
-         chunk.type = CT_LAMBDA;
+         chunk.SetType(CT_LAMBDA);
       }
 
       // Don't create an entry for whitespace
-      if (chunk.type == CT_WHITESPACE)
+      if (chunk.GetType() == CT_WHITESPACE)
       {
-         last_was_tab = chunk.after_tab;
-         prev_sp      = chunk.orig_prev_sp;
+         last_was_tab = chunk.GetAfterTab();
+         prev_sp      = chunk.GetOrigPrevSp();
          continue;
       }
-      chunk.orig_prev_sp = prev_sp;
-      prev_sp            = 0;
+      chunk.SetOrigPrevSp(prev_sp);
+      prev_sp = 0;
 
-      if (chunk.type == CT_NEWLINE)
+      if (chunk.GetType() == CT_NEWLINE)
       {
-         last_was_tab    = chunk.after_tab;
-         chunk.after_tab = false;
-         chunk.str.clear();
+         last_was_tab = chunk.GetAfterTab();
+         chunk.SetAfterTab(false);
+         chunk.Str().clear();
       }
-      else if (chunk.type == CT_NL_CONT)
+      else if (chunk.GetType() == CT_NL_CONT)
       {
-         last_was_tab    = chunk.after_tab;
-         chunk.after_tab = false;
-         chunk.str       = "\\\n";
+         last_was_tab = chunk.GetAfterTab();
+         chunk.SetAfterTab(false);
+         chunk.Str() = "\\\n";
       }
       else
       {
-         chunk.after_tab = last_was_tab;
-         last_was_tab    = false;
+         chunk.SetAfterTab(last_was_tab);
+         last_was_tab = false;
       }
       num_stripped = 0; // Issue #1966 and #3565
 
-      if (chunk.type != CT_IGNORED)
+      if (chunk.GetType() != CT_IGNORED)
       {
          // Issue #1338
          // Strip trailing whitespace (for CPP comments and PP blocks)
-         while (  (chunk.str.size() > 0)
-               && (  (chunk.str[chunk.str.size() - 1] == ' ')
-                  || (chunk.str[chunk.str.size() - 1] == '\t')))
+         while (  (chunk.GetStr().size() > 0)
+               && (  (chunk.GetStr()[chunk.GetStr().size() - 1] == ' ')
+                  || (chunk.GetStr()[chunk.GetStr().size() - 1] == '\t')))
          {
             // If comment contains backslash '\' followed by whitespace chars, keep last one;
             // this will prevent it from turning '\' into line continuation.
-            if (  (chunk.str.size() > 1)
-               && (chunk.str[chunk.str.size() - 2] == '\\'))
+            if (  (chunk.GetStr().size() > 1)
+               && (chunk.GetStr()[chunk.GetStr().size() - 2] == '\\'))
             {
                break;
             }
-            chunk.str.pop_back();
+            chunk.Str().pop_back();
             num_stripped++;                    // Issue #1966
          }
       }
       // Store off the end column
-      chunk.orig_col_end = ctx.c.col - num_stripped; // Issue #1966 and #3565
+      chunk.SetOrigColEnd(ctx.c.col - num_stripped); // Issue #1966 and #3565
+
+      // Make the whitespace we disposed of be attributed to the next chunk
+      prev_sp = num_stripped;
 
       // Add the chunk to the list
       rprev = pc;
 
       if (rprev != nullptr)
       {
-         chunk_flags_set(pc, rprev->flags & PCF_COPY_FLAGS);
+         pc->SetFlagBits(rprev->GetFlags() & PCF_COPY_FLAGS);
 
          // a newline can't be in a preprocessor
-         if (chunk_is_token(pc, CT_NEWLINE))
+         if (pc->Is(CT_NEWLINE))
          {
-            chunk_flags_clr(pc, PCF_IN_PREPROC);
+            pc->ResetFlagBits(PCF_IN_PREPROC);
          }
       }
 
       if (ref != nullptr)
       {
-         chunk.flags |= PCF_INSERTED;
+         chunk.SetFlagBits(PCF_INSERTED);
       }
       else
       {
-         chunk.flags &= ~PCF_INSERTED;
+         chunk.ResetFlagBits(PCF_INSERTED);
       }
-      pc = chunk_add_before(&chunk, ref);
+      pc = chunk.CopyAndAddBefore(ref);
 
       // A newline marks the end of a preprocessor
-      if (chunk_is_token(pc, CT_NEWLINE)) // || chunk_is_token(pc, CT_COMMENT_MULTI))
+      if (pc->Is(CT_NEWLINE)) // || pc->Is(CT_COMMENT_MULTI))
       {
          cpd.in_preproc         = CT_NONE;
          cpd.preproc_ncnl_count = 0;
       }
 
       // Disable indentation when #asm directive found
-      if (chunk_is_token(pc, CT_PP_ASM))
+      if (pc->Is(CT_PP_ASM))
       {
-         LOG_FMT(LBCTRL, "Found a directive %s on line %zu\n", "#asm", pc->orig_line);
+         LOG_FMT(LBCTRL, "Found a directive %s on line %zu\n", "#asm", pc->GetOrigLine());
          cpd.unc_off = true;
       }
 
       // Special handling for preprocessor stuff
       if (cpd.in_preproc != CT_NONE)
       {
-         chunk_flags_set(pc, PCF_IN_PREPROC);
+         pc->SetFlagBits(PCF_IN_PREPROC);
 
          // Count words after the preprocessor
-         if (  !pc->IsComment()
-            && !chunk_is_newline(pc))
+         if (!pc->IsCommentOrNewline())
          {
             cpd.preproc_ncnl_count++;
          }
@@ -2759,7 +2788,7 @@ void tokenize(const deque<int> &data, Chunk *ref)
          {
             if (memcmp(pc->Text(), "asm", 3) == 0)
             {
-               LOG_FMT(LBCTRL, "Found a pragma %s on line %zu\n", "asm", pc->orig_line);
+               LOG_FMT(LBCTRL, "Found a pragma %s on line %zu\n", "asm", pc->GetOrigLine());
                cpd.unc_off = true;
             }
          }
@@ -2767,26 +2796,23 @@ void tokenize(const deque<int> &data, Chunk *ref)
          // Figure out the type of preprocessor for #include parsing
          if (cpd.in_preproc == CT_PREPROC)
          {
-            if (  pc->type < CT_PP_DEFINE
-               || pc->type > CT_PP_OTHER)
+            if (  pc->GetType() < CT_PP_DEFINE
+               || pc->GetType() > CT_PP_OTHER)
             {
-               set_chunk_type(pc, CT_PP_OTHER);
+               pc->SetType(CT_PP_OTHER);
             }
-            cpd.in_preproc = pc->type;
+            cpd.in_preproc = pc->GetType();
          }
          else if (cpd.in_preproc == CT_PP_IGNORE)
          {
-            // ASSERT(options::pp_ignore_define_body());
-            if (  !chunk_is_token(pc, CT_NL_CONT)
-               && !chunk_is_token(pc, CT_COMMENT_CPP)
-               && !chunk_is_token(pc, CT_COMMENT)
-               && !chunk_is_token(pc, CT_COMMENT_MULTI))     // Issue #1966
+            if (  !pc->Is(CT_NL_CONT)
+               && !pc->IsComment())        // Issue #1966
             {
-               set_chunk_type(pc, CT_PP_IGNORE);
+               pc->SetType(CT_PP_IGNORE);
             }
          }
          else if (  cpd.in_preproc == CT_PP_DEFINE
-                 && chunk_is_token(pc, CT_PAREN_CLOSE)
+                 && pc->Is(CT_PAREN_CLOSE)
                  && options::pp_ignore_define_body())
          {
             log_rule_B("pp_ignore_define_body");
@@ -2798,31 +2824,31 @@ void tokenize(const deque<int> &data, Chunk *ref)
       else
       {
          // Check for a preprocessor start
-         if (  chunk_is_token(pc, CT_POUND)
+         if (  pc->Is(CT_POUND)
             && (  rprev == nullptr
-               || chunk_is_token(rprev, CT_NEWLINE)))
+               || rprev->Is(CT_NEWLINE)))
          {
-            set_chunk_type(pc, CT_PREPROC);
-            chunk_flags_set(pc, PCF_IN_PREPROC);
+            pc->SetType(CT_PREPROC);
+            pc->SetFlagBits(PCF_IN_PREPROC);
             cpd.in_preproc = CT_PREPROC;
          }
       }
 
-      if (chunk_is_token(pc, CT_NEWLINE))
+      if (pc->Is(CT_NEWLINE))
       {
-         LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
+         LOG_FMT(LGUY, "%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 (chunk_is_token(pc, CT_VBRACE_OPEN))
+      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",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->orig_col_end);
+         LOG_FMT(LGUY, "%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",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type), pc->orig_col_end);
+         LOG_FMT(LGUY, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s, orig col end is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy), get_token_name(pc->GetType()), pc->GetOrigColEnd());
       }
    }
    // Set the cpd.newline string for this file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.h
index a111143b..a111143b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.cpp
index 108a8db8..4a8e6773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.cpp
@@ -63,21 +63,21 @@ static Chunk *handle_double_angle_close(Chunk *pc);
 
 
 /**
- * Marks ObjC specific chunks in propery declaration, by setting
+ * Marks ObjC specific chunks in property declaration, by setting
  * parent types and chunk types.
  */
 static void cleanup_objc_property(Chunk *start);
 
 
 /**
- * Marks ObjC specific chunks in propery declaration (getter/setter attribute)
+ * Marks ObjC specific chunks in property declaration (getter/setter attribute)
  * Will mark 'test4Setter'and ':' in '@property (setter=test4Setter:, strong) int test4;' as CT_OC_SEL_NAME
  */
 static void mark_selectors_in_property_with_open_paren(Chunk *open_paren);
 
 
 /**
- * Marks ObjC specific chunks in propery declaration ( attributes)
+ * Marks ObjC specific chunks in property declaration ( attributes)
  * Changes all the CT_WORD and CT_TYPE to CT_OC_PROPERTY_ATTR
  */
 static void mark_attributes_in_property_with_open_paren(Chunk *open_paren);
@@ -93,24 +93,24 @@ static Chunk *handle_double_angle_close(Chunk *pc)
 
    if (next->IsNotNullChunk())
    {
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         && chunk_is_token(next, CT_ANGLE_CLOSE)
-         && get_chunk_parent_type(pc) == CT_NONE
-         && (pc->orig_col_end + 1) == next->orig_col
-         && get_chunk_parent_type(next) == CT_NONE)
+      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('>');
-         set_chunk_type(pc, CT_SHIFT);
-         pc->orig_col_end = next->orig_col_end;
+         pc->Str().append('>');
+         pc->SetType(CT_SHIFT);
+         pc->SetOrigColEnd(next->GetOrigColEnd());
 
          Chunk *tmp = next->GetNextNcNnl();
-         chunk_del(next);
+         Chunk::Delete(next);
          next = tmp;
       }
       else
       {
          // bug #663
-         set_chunk_type(pc, CT_COMPARE);
+         pc->SetType(CT_COMPARE);
       }
    }
    return(next);
@@ -127,19 +127,19 @@ void split_off_angle_close(Chunk *pc)
    }
    Chunk nc = *pc;
 
-   pc->str.resize(1);
-   pc->orig_col_end = pc->orig_col + 1;
-   set_chunk_type(pc, CT_ANGLE_CLOSE);
+   pc->Str().resize(1);
+   pc->SetOrigColEnd(pc->GetOrigCol() + 1);
+   pc->SetType(CT_ANGLE_CLOSE);
 
-   set_chunk_type(&nc, ct->type);
-   nc.str.pop_front();
-   nc.orig_col++;
-   nc.column++;
-   chunk_add_after(&nc, pc);
+   nc.SetType(ct->type);
+   nc.Str().pop_front();
+   nc.SetOrigCol(nc.GetOrigCol() + 1);
+   nc.SetColumn(nc.GetColumn() + 1);
+   nc.CopyAndAddAfter(pc);
 }
 
 
-void tokenize_trailing_return_types(void)
+void tokenize_trailing_return_types()
 {
    // Issue #2330
    // auto max(int a, int b) -> int;
@@ -166,28 +166,28 @@ void tokenize_trailing_return_types(void)
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       char copy[1000];
-      LOG_FMT(LNOTE, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy));
+      LOG_FMT(LNOTE, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy));
 
-      if (  chunk_is_token(pc, CT_MEMBER)
+      if (  pc->Is(CT_MEMBER)
          && (strcmp(pc->Text(), "->") == 0))
       {
          Chunk *tmp = pc->GetPrevNcNnl();
          Chunk *tmp_2;
          Chunk *open_paren;
 
-         if (chunk_is_token(tmp, CT_QUALIFIER))
+         if (tmp->Is(CT_QUALIFIER))
          {
             // auto max(int a, int b) const -> int;
             // auto f11() const -> bool;
             tmp = tmp->GetPrevNcNnl();
          }
-         else if (chunk_is_token(tmp, CT_NOEXCEPT))
+         else if (tmp->Is(CT_NOEXCEPT))
          {
             // noexcept is present
             tmp_2 = tmp->GetPrevNcNnl();
 
-            if (chunk_is_token(tmp_2, CT_QUALIFIER))
+            if (tmp_2->Is(CT_QUALIFIER))
             {
                // auto f12() const noexcept -> bool;
                // auto f15() const noexcept -> bool = delete;
@@ -200,17 +200,17 @@ void tokenize_trailing_return_types(void)
                tmp = tmp_2;
             }
          }
-         else if (chunk_is_token(tmp, CT_PAREN_CLOSE))
+         else if (tmp->Is(CT_PAREN_CLOSE))
          {
-            open_paren = tmp->GetPrevType(CT_PAREN_OPEN, tmp->level);
+            open_paren = tmp->GetPrevType(CT_PAREN_OPEN, tmp->GetLevel());
             tmp        = open_paren->GetPrevNcNnl();
 
-            if (chunk_is_token(tmp, CT_NOEXCEPT))
+            if (tmp->Is(CT_NOEXCEPT))
             {
                // noexcept is present
                tmp_2 = tmp->GetPrevNcNnl();
 
-               if (chunk_is_token(tmp_2, CT_QUALIFIER))
+               if (tmp_2->Is(CT_QUALIFIER))
                {
                   // auto f13() const noexcept(true) -> bool;
                   // auto f14() const noexcept(false) -> bool;
@@ -227,12 +227,12 @@ void tokenize_trailing_return_types(void)
                   tmp = tmp_2;
                }
             }
-            else if (chunk_is_token(tmp, CT_THROW))
+            else if (tmp->Is(CT_THROW))
             {
                // throw is present
                tmp_2 = tmp->GetPrevNcNnl();
 
-               if (chunk_is_token(tmp_2, CT_QUALIFIER))
+               if (tmp_2->Is(CT_QUALIFIER))
                {
                   // auto f23() const throw() -> bool;
                   // auto f24() const throw() -> bool = delete;
@@ -255,11 +255,11 @@ void tokenize_trailing_return_types(void)
             LOG_FMT(LNOTE, "%s(%d): NOT COVERED\n", __func__, __LINE__);
          }
 
-         if (  chunk_is_token(tmp, CT_FPAREN_CLOSE)
-            && (  get_chunk_parent_type(tmp) == CT_FUNC_PROTO
-               || get_chunk_parent_type(tmp) == CT_FUNC_DEF))
+         if (  tmp->Is(CT_FPAREN_CLOSE)
+            && (  tmp->GetParentType() == CT_FUNC_PROTO
+               || tmp->GetParentType() == CT_FUNC_DEF))
          {
-            set_chunk_type(pc, CT_TRAILING_RET);
+            pc->SetType(CT_TRAILING_RET);
             LOG_FMT(LNOTE, "%s(%d): set trailing return type for Text() is '%s'\n",
                     __func__, __LINE__, pc->Text());                  // Issue #3222
             // TODO
@@ -267,24 +267,24 @@ void tokenize_trailing_return_types(void)
             // noptr-declarator ( parameter-list ) cv(optional) ref(optional) except(optional) attr(optional) -> trailing
             Chunk *next = pc->GetNextNcNnl();
 
-            if (chunk_is_token(next, CT_DECLTYPE))
+            if (next->Is(CT_DECLTYPE))
             {
                // TODO
             }
-            else if (chunk_is_token(next, CT_WORD))
+            else if (next->Is(CT_WORD))
             {
-               set_chunk_type(next, CT_TYPE);                         // Issue #3222
+               next->SetType(CT_TYPE);                         // Issue #3222
                next = next->GetNextNcNnl();
 
-               if (chunk_is_token(next, CT_ARITH))
+               if (next->Is(CT_ARITH))
                {
-                  if (next->str[0] == '*')
+                  if (next->GetStr()[0] == '*')
                   {
-                     set_chunk_type(next, CT_PTR_TYPE);
+                     next->SetType(CT_PTR_TYPE);
                   }
-                  else if (next->str[0] == '&')                       // Issue #3407
+                  else if (next->GetStr()[0] == '&')                       // Issue #3407
                   {
-                     set_chunk_type(next, CT_BYREF);
+                     next->SetType(CT_BYREF);
                   }
                }
             }
@@ -298,11 +298,11 @@ void tokenize_trailing_return_types(void)
 } // tokenize_trailing_return_types
 
 
-void tokenize_cleanup(void)
+void tokenize_cleanup()
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *prev = nullptr;
+   Chunk *prev = Chunk::NullChunkPtr;
    Chunk *next;
    bool  in_type_cast = false;
 
@@ -316,48 +316,48 @@ void tokenize_cleanup(void)
 
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (chunk_is_token(pc, CT_SQUARE_OPEN))
+      if (pc->Is(CT_SQUARE_OPEN))
       {
          next = pc->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_SQUARE_CLOSE))
+         if (next->Is(CT_SQUARE_CLOSE))
          {
             // Change '[' + ']' into '[]'
-            set_chunk_type(pc, CT_TSQUARE);
-            pc->str = "[]";
+            pc->SetType(CT_TSQUARE);
+            pc->Str() = "[]";
             /*
-             * bug #664: The original orig_col_end of CT_SQUARE_CLOSE is
-             * stored at orig_col_end of CT_TSQUARE.
-             * pc->orig_col_end += 1;
+             * bug #664: The original m_origColEnd of CT_SQUARE_CLOSE is
+             * stored at m_origColEnd of CT_TSQUARE.
+             * pc->SetOrigColEnd(pc->GetOrigColEnd() + 1);
              */
-            pc->orig_col_end = next->orig_col_end;
-            chunk_del(next);
+            pc->SetOrigColEnd(next->GetOrigColEnd());
+            Chunk::Delete(next);
          }
       }
 
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && pc->flags.test(PCF_IN_PREPROC)
+      if (  pc->Is(CT_SEMICOLON)
+         && pc->TestFlags(PCF_IN_PREPROC)
          && !pc->GetNextNcNnl(E_Scope::PREPROC))
       {
          LOG_FMT(LNOTE, "%s(%d): %s:%zu Detected a macro that ends with a semicolon. Possible failures if used.\n",
-                 __func__, __LINE__, cpd.filename.c_str(), pc->orig_line);
+                 __func__, __LINE__, cpd.filename.c_str(), pc->GetOrigLine());
       }
    }
 
    // change := to CT_SQL_ASSIGN Issue #527
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-      if (chunk_is_token(pc, CT_COLON))
+      if (pc->Is(CT_COLON))
       {
          next = pc->GetNextNcNnl();
 
-         if (chunk_is_token(next, CT_ASSIGN))
+         if (next->Is(CT_ASSIGN))
          {
             // Change ':' + '=' into ':='
-            set_chunk_type(pc, CT_SQL_ASSIGN);
-            pc->str          = ":=";
-            pc->orig_col_end = next->orig_col_end;
-            chunk_del(next);
+            pc->SetType(CT_SQL_ASSIGN);
+            pc->Str() = ":=";
+            pc->SetOrigColEnd(next->GetOrigColEnd());
+            Chunk::Delete(next);
          }
       }
    }
@@ -369,47 +369,47 @@ void tokenize_cleanup(void)
    while (  pc->IsNotNullChunk()
          && next->IsNotNullChunk())
    {
-      if (  chunk_is_token(pc, CT_DOT)
+      if (  pc->Is(CT_DOT)
          && language_is_set(LANG_ALLC))
       {
-         set_chunk_type(pc, CT_MEMBER);
+         pc->SetType(CT_MEMBER);
       }
 
-      if (  chunk_is_token(pc, CT_NULLCOND)
+      if (  pc->Is(CT_NULLCOND)
          && language_is_set(LANG_CS))
       {
-         set_chunk_type(pc, CT_MEMBER);
+         pc->SetType(CT_MEMBER);
       }
 
       // Determine the version stuff (D only)
-      if (chunk_is_token(pc, CT_D_VERSION))
+      if (pc->Is(CT_D_VERSION))
       {
-         if (chunk_is_token(next, CT_PAREN_OPEN))
+         if (next->Is(CT_PAREN_OPEN))
          {
-            set_chunk_type(pc, CT_D_VERSION_IF);
+            pc->SetType(CT_D_VERSION_IF);
          }
          else
          {
-            if (next->type != CT_ASSIGN)
+            if (next->IsNot(CT_ASSIGN))
             {
                LOG_FMT(LERR, "%s(%d): %s:%zu: version: Unexpected token %s\n",
-                       __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, get_token_name(next->type));
-               cpd.error_count++;
+                       __func__, __LINE__, cpd.filename.c_str(), pc->GetOrigLine(), get_token_name(next->GetType()));
+               exit(EX_SOFTWARE);
             }
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
       }
 
       // Determine the scope stuff (D only)
-      if (chunk_is_token(pc, CT_D_SCOPE))
+      if (pc->Is(CT_D_SCOPE))
       {
-         if (chunk_is_token(next, CT_PAREN_OPEN))
+         if (next->Is(CT_PAREN_OPEN))
          {
-            set_chunk_type(pc, CT_D_SCOPE_IF);
+            pc->SetType(CT_D_SCOPE_IF);
          }
          else
          {
-            set_chunk_type(pc, CT_TYPE);
+            pc->SetType(CT_TYPE);
          }
       }
 
@@ -419,18 +419,18 @@ void tokenize_cleanup(void)
        * -or-
        * var x = (T)base.y;
        */
-      if (  chunk_is_token(pc, CT_BASE)
-         && (  chunk_is_token(next, CT_PAREN_OPEN)
-            || chunk_is_token(next, CT_DOT)))
+      if (  pc->Is(CT_BASE)
+         && (  next->Is(CT_PAREN_OPEN)
+            || next->Is(CT_DOT)))
       {
-         set_chunk_type(pc, CT_WORD);
+         pc->SetType(CT_WORD);
       }
 
-      if (  chunk_is_token(pc, CT_ENUM)
-         && (  chunk_is_token(next, CT_STRUCT)
-            || chunk_is_token(next, CT_CLASS)))
+      if (  pc->Is(CT_ENUM)
+         && (  next->Is(CT_STRUCT)
+            || next->Is(CT_CLASS)))
       {
-         set_chunk_type(next, CT_ENUM_CLASS);
+         next->SetType(CT_ENUM_CLASS);
       }
       Chunk *next_non_attr = language_is_set(LANG_CPP) ? skip_attribute_next(next) : next;
 
@@ -438,20 +438,16 @@ void tokenize_cleanup(void)
        * Change CT_WORD after CT_ENUM, CT_UNION, CT_STRUCT, or CT_CLASS to CT_TYPE
        * Change CT_WORD before CT_WORD to CT_TYPE
        */
-      if (chunk_is_token(next_non_attr, CT_WORD))
+      if (next_non_attr->Is(CT_WORD))
       {
-         if (  chunk_is_token(pc, CT_ENUM)
-            || chunk_is_token(pc, CT_ENUM_CLASS)
-            || chunk_is_token(pc, CT_UNION)
-            || chunk_is_token(pc, CT_STRUCT)
-            || chunk_is_token(pc, CT_CLASS))
+         if (pc->IsClassEnumStructOrUnion())
          {
-            set_chunk_type(next_non_attr, CT_TYPE);
+            next_non_attr->SetType(CT_TYPE);
          }
 
-         if (chunk_is_token(pc, CT_WORD))
+         if (pc->Is(CT_WORD))
          {
-            set_chunk_type(pc, CT_TYPE);
+            pc->SetType(CT_TYPE);
          }
       }
 
@@ -459,13 +455,13 @@ void tokenize_cleanup(void)
        * change extern to qualifier if extern isn't followed by a string or
        * an open parenthesis
        */
-      if (chunk_is_token(pc, CT_EXTERN))
+      if (pc->Is(CT_EXTERN))
       {
-         if (chunk_is_token(next, CT_STRING))
+         if (next->Is(CT_STRING))
          {
             // Probably 'extern "C"'
          }
-         else if (chunk_is_token(next, CT_PAREN_OPEN))
+         else if (next->Is(CT_PAREN_OPEN))
          {
             // Probably 'extern (C)'
          }
@@ -475,9 +471,9 @@ void tokenize_cleanup(void)
             Chunk *tmp = next->GetNextNcNnl();
 
             if (  tmp->IsNullChunk()
-               || tmp->type != CT_BRACE_OPEN)
+               || tmp->IsNot(CT_BRACE_OPEN))
             {
-               set_chunk_type(pc, CT_QUALIFIER);
+               pc->SetType(CT_QUALIFIER);
             }
          }
       }
@@ -488,36 +484,36 @@ void tokenize_cleanup(void)
        * or by a
        *     CT_WORD which is preceded by CT_DC_MEMBER: '::aaa *b'
        */
-      if (  (chunk_is_token(next, CT_STAR))
+      if (  (next->Is(CT_STAR))
          || (  language_is_set(LANG_CPP)
-            && (chunk_is_token(next, CT_CARET)))
+            && (next->Is(CT_CARET)))
          || (  language_is_set(LANG_CS | LANG_VALA)
-            && (chunk_is_token(next, CT_QUESTION))
+            && (next->Is(CT_QUESTION))
             && (strcmp(pc->Text(), "null") != 0)))
       {
-         if (  chunk_is_token(pc, CT_TYPE)
-            || chunk_is_token(pc, CT_QUALIFIER)
-            || chunk_is_token(pc, CT_PTR_TYPE))
+         if (  pc->Is(CT_TYPE)
+            || pc->Is(CT_QUALIFIER)
+            || pc->Is(CT_PTR_TYPE))
          {
-            set_chunk_type(next, CT_PTR_TYPE);
+            next->SetType(CT_PTR_TYPE);
          }
       }
 
-      if (  chunk_is_token(pc, CT_TYPE_CAST)
-         && chunk_is_token(next, CT_ANGLE_OPEN))
+      if (  pc->Is(CT_TYPE_CAST)
+         && next->Is(CT_ANGLE_OPEN))
       {
-         set_chunk_parent(next, CT_TYPE_CAST);
+         next->SetParentType(CT_TYPE_CAST);
          in_type_cast = true;
       }
 
-      if (chunk_is_token(pc, CT_DECLTYPE))
+      if (pc->Is(CT_DECLTYPE))
       {
          flag_cpp_decltype(pc);
       }
 
       // Change angle open/close to CT_COMPARE, if not a template thingy
-      if (  chunk_is_token(pc, CT_ANGLE_OPEN)
-         && pc->parent_type != CT_TYPE_CAST)
+      if (  pc->Is(CT_ANGLE_OPEN)
+         && pc->GetParentType() != CT_TYPE_CAST)
       {
          /*
           * pretty much all languages except C use <> for something other than
@@ -531,17 +527,17 @@ void tokenize_cleanup(void)
          else
          {
             // convert CT_ANGLE_OPEN to CT_COMPARE
-            set_chunk_type(pc, CT_COMPARE);
+            pc->SetType(CT_COMPARE);
          }
       }
 
-      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
-         && pc->parent_type != CT_TEMPLATE)
+      if (  pc->Is(CT_ANGLE_CLOSE)
+         && pc->GetParentType() != CT_TEMPLATE)
       {
          if (in_type_cast)
          {
             in_type_cast = false;
-            set_chunk_parent(pc, CT_TYPE_CAST);
+            pc->SetParentType(CT_TYPE_CAST);
          }
          else
          {
@@ -552,50 +548,50 @@ void tokenize_cleanup(void)
       if (language_is_set(LANG_D))
       {
          // Check for the D string concat symbol '~'
-         if (  chunk_is_token(pc, CT_INV)
-            && (  chunk_is_token(prev, CT_STRING)
-               || chunk_is_token(prev, CT_WORD)
-               || chunk_is_token(next, CT_STRING)))
+         if (  pc->Is(CT_INV)
+            && (  prev->Is(CT_STRING)
+               || prev->Is(CT_WORD)
+               || next->Is(CT_STRING)))
          {
-            set_chunk_type(pc, CT_CONCAT);
+            pc->SetType(CT_CONCAT);
          }
 
          // Check for the D template symbol '!' (word + '!' + word or '(')
-         if (  chunk_is_token(pc, CT_NOT)
-            && chunk_is_token(prev, CT_WORD)
-            && (  chunk_is_token(next, CT_PAREN_OPEN)
-               || chunk_is_token(next, CT_WORD)
-               || chunk_is_token(next, CT_TYPE)
-               || chunk_is_token(next, CT_NUMBER)
-               || chunk_is_token(next, CT_NUMBER_FP)
-               || chunk_is_token(next, CT_STRING)
-               || chunk_is_token(next, CT_STRING_MULTI)))
+         if (  pc->Is(CT_NOT)
+            && prev->Is(CT_WORD)
+            && (  next->Is(CT_PAREN_OPEN)
+               || next->Is(CT_WORD)
+               || next->Is(CT_TYPE)
+               || next->Is(CT_NUMBER)
+               || next->Is(CT_NUMBER_FP)
+               || next->Is(CT_STRING)
+               || next->Is(CT_STRING_MULTI)))
          {
-            set_chunk_type(pc, CT_D_TEMPLATE);
+            pc->SetType(CT_D_TEMPLATE);
          }
 
          // handle "version(unittest) { }" vs "unittest { }"
-         if (  chunk_is_token(pc, CT_UNITTEST)
-            && chunk_is_token(prev, CT_PAREN_OPEN))
+         if (  pc->Is(CT_UNITTEST)
+            && prev->Is(CT_PAREN_OPEN))
          {
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
 
          // handle 'static if' and merge the tokens
-         if (  chunk_is_token(pc, CT_IF)
-            && chunk_is_str(prev, "static"))
+         if (  pc->Is(CT_IF)
+            && prev->IsString("static"))
          {
             // delete PREV and merge with IF
-            pc->str.insert(0, ' ');
-            pc->str.insert(0, prev->str);
-            pc->orig_col  = prev->orig_col;
-            pc->orig_line = prev->orig_line;
+            pc->Str().insert(0, ' ');
+            pc->Str().insert(0, prev->GetStr());
+            pc->SetOrigCol(prev->GetOrigCol());
+            pc->SetOrigLine(prev->GetOrigLine());
             Chunk *to_be_deleted = prev;
             prev = prev->GetPrevNcNnl();
 
             if (prev->IsNotNullChunk())
             {
-               chunk_del(to_be_deleted);
+               Chunk::Delete(to_be_deleted);
             }
          }
       }
@@ -603,52 +599,52 @@ void tokenize_cleanup(void)
       if (language_is_set(LANG_CPP))
       {
          // Change Word before '::' into a type
-         if (  chunk_is_token(pc, CT_WORD)
-            && chunk_is_token(next, CT_DC_MEMBER))
+         if (  pc->Is(CT_WORD)
+            && next->Is(CT_DC_MEMBER))
          {
             prev = pc->GetPrev();
 
             if (prev->IsNullChunk())                  // Issue #3010
             {
-               set_chunk_type(pc, CT_TYPE);
+               pc->SetType(CT_TYPE);
             }
             else
             {
-               if (chunk_is_token(prev, CT_COLON))
+               if (prev->Is(CT_COLON))
                {
                   // nothing to do
                }
                else
                {
-                  set_chunk_type(pc, CT_TYPE);
+                  pc->SetType(CT_TYPE);
                }
             }
          }
 
          // Set parent type for 'if constexpr'
-         if (  chunk_is_token(prev, CT_IF)
-            && chunk_is_token(pc, CT_QUALIFIER)
-            && chunk_is_str(pc, "constexpr"))
+         if (  prev->Is(CT_IF)
+            && pc->Is(CT_QUALIFIER)
+            && pc->IsString("constexpr"))
          {
-            set_chunk_type(pc, CT_CONSTEXPR);
+            pc->SetType(CT_CONSTEXPR);
          }
       }
 
       // Change get/set to CT_WORD if not followed by a brace open
-      if (  chunk_is_token(pc, CT_GETSET)
-         && next->type != CT_BRACE_OPEN)
+      if (  pc->Is(CT_GETSET)
+         && next->IsNot(CT_BRACE_OPEN))
       {
-         if (  chunk_is_token(next, CT_SEMICOLON)
-            && (  chunk_is_token(prev, CT_BRACE_CLOSE)
-               || chunk_is_token(prev, CT_BRACE_OPEN)
-               || chunk_is_token(prev, CT_SEMICOLON)))
+         if (  next->Is(CT_SEMICOLON)
+            && (  prev->Is(CT_BRACE_CLOSE)
+               || prev->Is(CT_BRACE_OPEN)
+               || prev->Is(CT_SEMICOLON)))
          {
-            set_chunk_type(pc, CT_GETSET_EMPTY);
-            set_chunk_parent(next, CT_GETSET);
+            pc->SetType(CT_GETSET_EMPTY);
+            next->SetParentType(CT_GETSET);
          }
          else
          {
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
       }
 
@@ -656,28 +652,28 @@ void tokenize_cleanup(void)
        * Interface is only a keyword in MS land if followed by 'class' or 'struct'
        * likewise, 'class' may be a member name in Java.
        */
-      if (  chunk_is_token(pc, CT_CLASS)
-         && !CharTable::IsKw1(next->str[0]))
+      if (  pc->Is(CT_CLASS)
+         && !CharTable::IsKw1(next->GetStr()[0]))
       {
-         if (  chunk_is_not_token(next, CT_DC_MEMBER)
-            && chunk_is_not_token(next, CT_ATTRIBUTE))                       // Issue #2570
+         if (  next->IsNot(CT_DC_MEMBER)
+            && next->IsNot(CT_ATTRIBUTE))                       // Issue #2570
          {
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
-         else if (  chunk_is_token(prev, CT_DC_MEMBER)
-                 || chunk_is_token(prev, CT_TYPE))
+         else if (  prev->Is(CT_DC_MEMBER)
+                 || prev->Is(CT_TYPE))
          {
-            set_chunk_type(pc, CT_TYPE);
+            pc->SetType(CT_TYPE);
          }
-         else if (chunk_is_token(next, CT_DC_MEMBER))
+         else if (next->Is(CT_DC_MEMBER))
          {
             Chunk *next2 = next->GetNextNcNnlNet();
 
-            if (  chunk_is_token(next2, CT_INV)      // CT_INV hasn't turned into CT_DESTRUCTOR just yet
-               || (  chunk_is_token(next2, CT_CLASS) // constructor isn't turned into CT_FUNC* just yet
+            if (  next2->Is(CT_INV)      // CT_INV hasn't turned into CT_DESTRUCTOR just yet
+               || (  next2->Is(CT_CLASS) // constructor isn't turned into CT_FUNC* just yet
                   && !strcmp(pc->Text(), next2->Text())))
             {
-               set_chunk_type(pc, CT_TYPE);
+               pc->SetType(CT_TYPE);
             }
          }
       }
@@ -699,39 +695,39 @@ void tokenize_cleanup(void)
        * In all cases except the last, this will put the entire operator value
        * in one chunk.
        */
-      if (chunk_is_token(pc, CT_OPERATOR))
+      if (pc->Is(CT_OPERATOR))
       {
          Chunk *tmp2 = next->GetNext();
 
          // Handle special case of () operator -- [] already handled
-         if (chunk_is_token(next, CT_PAREN_OPEN))
+         if (next->Is(CT_PAREN_OPEN))
          {
             Chunk *tmp = next->GetNext();
 
-            if (chunk_is_token(tmp, CT_PAREN_CLOSE))
+            if (tmp->Is(CT_PAREN_CLOSE))
             {
-               next->str = "()";
-               set_chunk_type(next, CT_OPERATOR_VAL);
-               chunk_del(tmp);
-               next->orig_col_end += 1;
+               next->Str() = "()";
+               next->SetType(CT_OPERATOR_VAL);
+               Chunk::Delete(tmp);
+               next->SetOrigColEnd(next->GetOrigColEnd() + 1);
             }
          }
-         else if (  chunk_is_token(next, CT_ANGLE_CLOSE)
-                 && chunk_is_token(tmp2, CT_ANGLE_CLOSE)
-                 && tmp2->orig_col == next->orig_col_end)
+         else if (  next->Is(CT_ANGLE_CLOSE)
+                 && tmp2->Is(CT_ANGLE_CLOSE)
+                 && tmp2->GetOrigCol() == next->GetOrigColEnd())
          {
-            next->str.append('>');
-            next->orig_col_end++;
-            set_chunk_type(next, CT_OPERATOR_VAL);
-            chunk_del(tmp2);
+            next->Str().append('>');
+            next->SetOrigColEnd(next->GetOrigColEnd() + 1);
+            next->SetType(CT_OPERATOR_VAL);
+            Chunk::Delete(tmp2);
          }
-         else if (next->flags.test(PCF_PUNCTUATOR))
+         else if (next->TestFlags(PCF_PUNCTUATOR))
          {
-            set_chunk_type(next, CT_OPERATOR_VAL);
+            next->SetType(CT_OPERATOR_VAL);
          }
          else
          {
-            set_chunk_type(next, CT_TYPE);
+            next->SetType(CT_TYPE);
 
             /*
              * Replace next with a collection of all tokens that are part of
@@ -742,13 +738,13 @@ void tokenize_cleanup(void)
 
             while ((tmp = tmp2->GetNext())->IsNotNullChunk())
             {
-               if (  tmp->type != CT_WORD
-                  && tmp->type != CT_TYPE
-                  && tmp->type != CT_QUALIFIER
-                  && tmp->type != CT_STAR
-                  && tmp->type != CT_CARET
-                  && tmp->type != CT_AMP
-                  && tmp->type != CT_TSQUARE)
+               if (  tmp->IsNot(CT_WORD)
+                  && tmp->IsNot(CT_TYPE)
+                  && tmp->IsNot(CT_QUALIFIER)
+                  && tmp->IsNot(CT_STAR)
+                  && tmp->IsNot(CT_CARET)
+                  && tmp->IsNot(CT_AMP)
+                  && tmp->IsNot(CT_TSQUARE))
                {
                   break;
                }
@@ -758,77 +754,77 @@ void tokenize_cleanup(void)
 
                while (num_sp-- > 0)
                {
-                  next->str.append(" ");
+                  next->Str().append(" ");
                }
-               next->str.append(tmp->str);
+               next->Str().append(tmp->GetStr());
                tmp2 = tmp;
             }
 
             while ((tmp2 = next->GetNext()) != tmp)
             {
-               chunk_del(tmp2);
+               Chunk::Delete(tmp2);
             }
-            set_chunk_type(next, CT_OPERATOR_VAL);
+            next->SetType(CT_OPERATOR_VAL);
 
-            next->orig_col_end = next->orig_col + next->Len();
+            next->SetOrigColEnd(next->GetOrigCol() + next->Len());
          }
-         set_chunk_parent(next, CT_OPERATOR);
+         next->SetParentType(CT_OPERATOR);
 
          LOG_FMT(LOPERATOR, "%s(%d): %zu:%zu operator '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, next->Text());
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), next->Text());
       }
 
       // Change private, public, protected into either a qualifier or label
-      if (chunk_is_token(pc, CT_ACCESS))
+      if (pc->Is(CT_ACCESS))
       {
          // Handle Qt slots - maybe should just check for a CT_WORD?
-         if (  chunk_is_str(next, "slots")
-            || chunk_is_str(next, "Q_SLOTS"))
+         if (  next->IsString("slots")
+            || next->IsString("Q_SLOTS"))
          {
             Chunk *tmp = next->GetNext();
 
-            if (chunk_is_token(tmp, CT_COLON))
+            if (tmp->Is(CT_COLON))
             {
                next = tmp;
             }
          }
 
-         if (chunk_is_token(next, CT_COLON))
+         if (next->Is(CT_COLON))
          {
-            set_chunk_type(next, CT_ACCESS_COLON);
+            next->SetType(CT_ACCESS_COLON);
             Chunk *tmp;
 
             if ((tmp = next->GetNextNcNnl())->IsNotNullChunk())
             {
-               chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
+               tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
             }
          }
          else
          {
-            set_chunk_type(pc, (  chunk_is_str(pc, "signals")
-                               || chunk_is_str(pc, "Q_SIGNALS"))
+            pc->SetType((  pc->IsString("signals")
+                        || pc->IsString("Q_SIGNALS"))
                            ? CT_WORD : CT_QUALIFIER);
          }
       }
 
       // Look for <newline> 'EXEC' 'SQL'
-      if (  (  chunk_is_str_case(pc, "EXEC", 4)
-            && chunk_is_str_case(next, "SQL", 3))
-         || (  (*pc->str.c_str() == '$')
-            && pc->type != CT_SQL_WORD
+      if (  (  pc->IsString("EXEC", false)
+            && next->IsString("SQL", false))
+         || (  (*pc->GetStr().c_str() == '$')
+            && pc->IsNot(CT_SQL_WORD)
                /* but avoid breaking tokenization for C# 6 interpolated strings. */
             && (  !language_is_set(LANG_CS)
-               || (  chunk_is_token(pc, CT_STRING)
-                  && (!pc->str.startswith("$\""))
-                  && (!pc->str.startswith("$@\""))))))
+               || (  pc->Is(CT_STRING)
+                  && (!pc->GetStr().startswith("$\""))
+                  && (!pc->GetStr().startswith("$@\""))))))
       {
          Chunk *tmp = pc->GetPrev();
 
-         if (chunk_is_newline(tmp))
+         if (tmp->IsNewline())
          {
-            if (*pc->str.c_str() == '$')
+            if (*pc->GetStr().c_str() == '$')
             {
-               set_chunk_type(pc, CT_SQL_EXEC);
+               pc->SetType(CT_SQL_EXEC);
 
                if (pc->Len() > 1)
                {
@@ -836,46 +832,46 @@ void tokenize_cleanup(void)
                   Chunk nc;
 
                   nc = *pc;
-                  pc->str.resize(1);
-                  pc->orig_col_end = pc->orig_col + 1;
+                  pc->Str().resize(1);
+                  pc->SetOrigColEnd(pc->GetOrigCol() + 1);
 
-                  set_chunk_type(&nc, CT_SQL_WORD);
-                  nc.str.pop_front();
-                  nc.orig_col++;
-                  nc.column++;
-                  chunk_add_after(&nc, pc);
+                  nc.SetType(CT_SQL_WORD);
+                  nc.Str().pop_front();
+                  nc.SetOrigCol(nc.GetOrigCol() + 1);
+                  nc.SetColumn(nc.GetColumn() + 1);
+                  nc.CopyAndAddAfter(pc);
 
                   next = pc->GetNext();
                }
             }
             tmp = next->GetNext();
 
-            if (chunk_is_str_case(tmp, "BEGIN", 5))
+            if (tmp->IsString("BEGIN", false))
             {
-               set_chunk_type(pc, CT_SQL_BEGIN);
+               pc->SetType(CT_SQL_BEGIN);
             }
-            else if (chunk_is_str_case(tmp, "END", 3))
+            else if (tmp->IsString("END", false))
             {
-               set_chunk_type(pc, CT_SQL_END);
+               pc->SetType(CT_SQL_END);
             }
             else
             {
-               set_chunk_type(pc, CT_SQL_EXEC);
+               pc->SetType(CT_SQL_EXEC);
             }
 
             // Change words into CT_SQL_WORD until CT_SEMICOLON
             while (tmp->IsNotNullChunk())
             {
-               if (chunk_is_token(tmp, CT_SEMICOLON))
+               if (tmp->Is(CT_SEMICOLON))
                {
                   break;
                }
 
                if (  (tmp->Len() > 0)
-                  && (  unc_isalpha(*tmp->str.c_str())
-                     || (*tmp->str.c_str() == '$')))
+                  && (  unc_isalpha(*tmp->GetStr().c_str())
+                     || (*tmp->GetStr().c_str() == '$')))
                {
-                  set_chunk_type(tmp, CT_SQL_WORD);
+                  tmp->SetType(CT_SQL_WORD);
                }
                tmp = tmp->GetNextNcNnl();
             }
@@ -883,28 +879,28 @@ void tokenize_cleanup(void)
       }
 
       // handle MS abomination 'for each'
-      if (  chunk_is_token(pc, CT_FOR)
-         && chunk_is_str(next, "each")
+      if (  pc->Is(CT_FOR)
+         && next->IsString("each")
          && (next == pc->GetNext()))
       {
          // merge the two with a space between
-         pc->str.append(' ');
-         pc->str         += next->str;
-         pc->orig_col_end = next->orig_col_end;
-         chunk_del(next);
+         pc->Str().append(' ');
+         pc->Str() += next->GetStr();
+         pc->SetOrigColEnd(next->GetOrigColEnd());
+         Chunk::Delete(next);
          next = pc->GetNextNcNnl();
 
          // label the 'in'
-         if (chunk_is_token(next, CT_PAREN_OPEN))
+         if (next->Is(CT_PAREN_OPEN))
          {
             Chunk *tmp = next->GetNextNcNnl();
 
             while (  tmp->IsNotNullChunk()
-                  && tmp->type != CT_PAREN_CLOSE)
+                  && tmp->IsNot(CT_PAREN_CLOSE))
             {
-               if (chunk_is_str(tmp, "in"))
+               if (tmp->IsString("in"))
                {
-                  set_chunk_type(tmp, CT_IN);
+                  tmp->SetType(CT_IN);
                   break;
                }
                tmp = tmp->GetNextNcNnl();
@@ -918,88 +914,102 @@ void tokenize_cleanup(void)
        */
       if (language_is_set(LANG_OC))
       {
-         if (  (  chunk_is_token(pc, CT_IF)
-               || chunk_is_token(pc, CT_FOR)
-               || chunk_is_token(pc, CT_WHILE))
-            && !chunk_is_token(next, CT_PAREN_OPEN))
+         if (  (  pc->Is(CT_IF)
+               || pc->Is(CT_FOR)
+               || pc->Is(CT_WHILE))
+            && !next->Is(CT_PAREN_OPEN))
          {
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
 
-         if (  chunk_is_token(pc, CT_DO)
-            && (  chunk_is_token(prev, CT_MINUS)
-               || chunk_is_token(next, CT_SQUARE_CLOSE)))
+         if (  pc->Is(CT_DO)
+            && (  prev->Is(CT_MINUS)
+               || next->Is(CT_SQUARE_CLOSE)))
          {
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
 
          // Fix self keyword back to word when mixing c++/objective-c
-         if (  chunk_is_token(pc, CT_THIS)
+         if (  pc->Is(CT_THIS)
             && !strcmp(pc->Text(), "self")
-            && (  chunk_is_token(next, CT_COMMA)
-               || chunk_is_token(next, CT_PAREN_CLOSE)))
+            && (  next->Is(CT_COMMA)
+               || next->Is(CT_PAREN_CLOSE)))
          {
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
 
          // Fix self keyword back to word when mixing c++/objective-c
-         if (  chunk_is_token(pc, CT_THIS)
+         if (  pc->Is(CT_THIS)
             && !strcmp(pc->Text(), "self")
-            && (  chunk_is_token(next, CT_COMMA)
-               || chunk_is_token(next, CT_PAREN_CLOSE)))
+            && (  next->Is(CT_COMMA)
+               || next->Is(CT_PAREN_CLOSE)))
+         {
+            pc->SetType(CT_WORD);
+         }
+      }
+
+      // Vala allows keywords to be used as identifiers
+      if (language_is_set(LANG_VALA))
+      {
+         if (  find_keyword_type(pc->Text(), pc->Len()) != CT_WORD
+            && (  prev->Is(CT_DOT)
+               || next->Is(CT_DOT)
+               || prev->Is(CT_MEMBER)
+               || next->Is(CT_MEMBER)
+               || prev->Is(CT_TYPE)))
          {
-            set_chunk_type(pc, CT_WORD);
+            pc->SetType(CT_WORD);
          }
       }
 
       // Another hack to clean up more keyword abuse
-      if (  chunk_is_token(pc, CT_CLASS)
-         && (  chunk_is_token(prev, CT_DOT)
-            || chunk_is_token(next, CT_DOT)
-            || chunk_is_token(prev, CT_MEMBER)  // Issue #3031
-            || chunk_is_token(next, CT_MEMBER)))
+      if (  pc->Is(CT_CLASS)
+         && (  prev->Is(CT_DOT)
+            || next->Is(CT_DOT)
+            || prev->Is(CT_MEMBER)  // Issue #3031
+            || next->Is(CT_MEMBER)))
       {
-         set_chunk_type(pc, CT_WORD);
+         pc->SetType(CT_WORD);
       }
 
       // Detect Objective C class name
-      if (  chunk_is_token(pc, CT_OC_IMPL)
-         || chunk_is_token(pc, CT_OC_INTF)
-         || chunk_is_token(pc, CT_OC_PROTOCOL))
+      if (  pc->Is(CT_OC_IMPL)
+         || pc->Is(CT_OC_INTF)
+         || pc->Is(CT_OC_PROTOCOL))
       {
-         if (next->type != CT_PAREN_OPEN)
+         if (next->IsNot(CT_PAREN_OPEN))
          {
-            set_chunk_type(next, CT_OC_CLASS);
+            next->SetType(CT_OC_CLASS);
          }
-         set_chunk_parent(next, pc->type);
+         next->SetParentType(pc->GetType());
 
          Chunk *tmp = next->GetNextNcNnl();
 
          if (tmp->IsNotNullChunk())
          {
-            chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
+            tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
          }
-         tmp = pc->GetNextType(CT_OC_END, pc->level);
+         tmp = pc->GetNextType(CT_OC_END, pc->GetLevel());
 
          if (tmp->IsNotNullChunk())
          {
-            set_chunk_parent(tmp, pc->type);
+            tmp->SetParentType(pc->GetType());
          }
       }
 
-      if (chunk_is_token(pc, CT_OC_INTF))
+      if (pc->Is(CT_OC_INTF))
       {
          Chunk *tmp = pc->GetNextNcNnl(E_Scope::PREPROC);
 
          while (  tmp->IsNotNullChunk()
-               && tmp->type != CT_OC_END)
+               && tmp->IsNot(CT_OC_END))
          {
-            if (get_token_pattern_class(tmp->type) != pattern_class_e::NONE)
+            if (get_token_pattern_class(tmp->GetType()) != pattern_class_e::NONE)
             {
                LOG_FMT(LOBJCWORD, "%s(%d): @interface %zu:%zu change '%s' (%s) to CT_WORD\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, tmp->Text(),
-                       get_token_name(tmp->type));
-               set_chunk_type(tmp, CT_WORD);
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), tmp->Text(),
+                       get_token_name(tmp->GetType()));
+               tmp->SetType(CT_WORD);
             }
             tmp = tmp->GetNextNcNnl(E_Scope::PREPROC);
          }
@@ -1012,34 +1022,34 @@ void tokenize_cleanup(void)
        *   @interface ClassName ()
        *   @implementation ClassName ()
        */
-      if (  (  get_chunk_parent_type(pc) == CT_OC_IMPL
-            || get_chunk_parent_type(pc) == CT_OC_INTF
-            || chunk_is_token(pc, CT_OC_CLASS))
-         && chunk_is_token(next, CT_PAREN_OPEN))
+      if (  (  pc->GetParentType() == CT_OC_IMPL
+            || pc->GetParentType() == CT_OC_INTF
+            || pc->Is(CT_OC_CLASS))
+         && next->Is(CT_PAREN_OPEN))
       {
-         set_chunk_parent(next, get_chunk_parent_type(pc));
+         next->SetParentType(pc->GetParentType());
 
          Chunk *tmp = next->GetNext();
 
          if (  tmp->IsNotNullChunk()
             && tmp->GetNext()->IsNotNullChunk())
          {
-            if (chunk_is_token(tmp, CT_PAREN_CLOSE))
+            if (tmp->Is(CT_PAREN_CLOSE))
             {
-               //set_chunk_type(tmp, CT_OC_CLASS_EXT);
-               set_chunk_parent(tmp, get_chunk_parent_type(pc));
+               //tmp->SetType(CT_OC_CLASS_EXT);
+               tmp->SetParentType(pc->GetParentType());
             }
             else
             {
-               set_chunk_type(tmp, CT_OC_CATEGORY);
-               set_chunk_parent(tmp, get_chunk_parent_type(pc));
+               tmp->SetType(CT_OC_CATEGORY);
+               tmp->SetParentType(pc->GetParentType());
             }
          }
-         tmp = pc->GetNextType(CT_PAREN_CLOSE, pc->level);
+         tmp = pc->GetNextType(CT_PAREN_CLOSE, pc->GetLevel());
 
          if (tmp->IsNotNullChunk())
          {
-            set_chunk_parent(tmp, get_chunk_parent_type(pc));
+            tmp->SetParentType(pc->GetParentType());
          }
       }
 
@@ -1048,11 +1058,11 @@ void tokenize_cleanup(void)
        *   @property NSString *stringProperty;
        *   @property(nonatomic, retain) NSMutableDictionary *shareWith;
        */
-      if (chunk_is_token(pc, CT_OC_PROPERTY))
+      if (pc->Is(CT_OC_PROPERTY))
       {
-         if (next->type != CT_PAREN_OPEN)
+         if (next->IsNot(CT_PAREN_OPEN))
          {
-            chunk_flags_set(next, PCF_STMT_START | PCF_EXPR_START);
+            next->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
          }
          else
          {
@@ -1066,84 +1076,84 @@ void tokenize_cleanup(void)
        *   @selector(msgNameWith1Arg:)
        *   @selector(msgNameWith2Args:arg2Name:)
        */
-      if (  chunk_is_token(pc, CT_OC_SEL)
-         && chunk_is_token(next, CT_PAREN_OPEN))
+      if (  pc->Is(CT_OC_SEL)
+         && next->Is(CT_PAREN_OPEN))
       {
-         set_chunk_parent(next, pc->type);
+         next->SetParentType(pc->GetType());
 
          Chunk *tmp = next->GetNext();
 
          if (tmp->IsNotNullChunk())
          {
-            set_chunk_type(tmp, CT_OC_SEL_NAME);
-            set_chunk_parent(tmp, pc->type);
+            tmp->SetType(CT_OC_SEL_NAME);
+            tmp->SetParentType(pc->GetType());
 
             while ((tmp = tmp->GetNextNcNnl())->IsNotNullChunk())
             {
-               if (chunk_is_token(tmp, CT_PAREN_CLOSE))
+               if (tmp->Is(CT_PAREN_CLOSE))
                {
-                  set_chunk_parent(tmp, CT_OC_SEL);
+                  tmp->SetParentType(CT_OC_SEL);
                   break;
                }
-               set_chunk_type(tmp, CT_OC_SEL_NAME);
-               set_chunk_parent(tmp, pc->type);
+               tmp->SetType(CT_OC_SEL_NAME);
+               tmp->SetParentType(pc->GetType());
             }
          }
       }
 
       // Handle special preprocessor junk
-      if (chunk_is_token(pc, CT_PREPROC))
+      if (pc->Is(CT_PREPROC))
       {
-         set_chunk_parent(pc, next->type);
+         pc->SetParentType(next->GetType());
       }
 
       // Detect "pragma region" and "pragma endregion"
-      if (  chunk_is_token(pc, CT_PP_PRAGMA)
-         && chunk_is_token(next, CT_PREPROC_BODY))
+      if (  pc->Is(CT_PP_PRAGMA)
+         && next->Is(CT_PREPROC_BODY))
       {
-         if (  (strncmp(next->str.c_str(), "region", 6) == 0)
-            || (strncmp(next->str.c_str(), "endregion", 9) == 0))
+         if (  (strncmp(next->GetStr().c_str(), "region", 6) == 0)
+            || (strncmp(next->GetStr().c_str(), "endregion", 9) == 0))
          // TODO: probably better use strncmp
          {
-            set_chunk_type(pc, (*next->str.c_str() == 'r') ? CT_PP_REGION : CT_PP_ENDREGION);
+            pc->SetType((*next->GetStr().c_str() == 'r') ? CT_PP_REGION : CT_PP_ENDREGION);
 
-            set_chunk_parent(prev, pc->type);
+            prev->SetParentType(pc->GetType());
          }
       }
 
       // Change 'default(' into a sizeof-like statement
       if (  language_is_set(LANG_CS)
-         && chunk_is_token(pc, CT_DEFAULT)
-         && chunk_is_token(next, CT_PAREN_OPEN))
+         && pc->Is(CT_DEFAULT)
+         && next->Is(CT_PAREN_OPEN))
       {
-         set_chunk_type(pc, CT_SIZEOF);
+         pc->SetType(CT_SIZEOF);
       }
 
-      if (  chunk_is_token(pc, CT_UNSAFE)
-         && next->type != CT_BRACE_OPEN)
+      if (  pc->Is(CT_UNSAFE)
+         && next->IsNot(CT_BRACE_OPEN))
       {
-         set_chunk_type(pc, CT_QUALIFIER);
+         pc->SetType(CT_QUALIFIER);
       }
 
-      if (  (  chunk_is_token(pc, CT_USING)
-            || (  chunk_is_token(pc, CT_TRY)
+      if (  (  pc->Is(CT_USING)
+            || (  pc->Is(CT_TRY)
                && language_is_set(LANG_JAVA)))
-         && chunk_is_token(next, CT_PAREN_OPEN))
+         && next->Is(CT_PAREN_OPEN))
       {
-         set_chunk_type(pc, CT_USING_STMT);
+         pc->SetType(CT_USING_STMT);
       }
 
       // Add minimal support for C++0x rvalue references
-      if (  chunk_is_token(pc, CT_BOOL)
+      if (  pc->Is(CT_BOOL)
          && language_is_set(LANG_CPP)
-         && chunk_is_str(pc, "&&"))
+         && pc->IsString("&&"))
       {
-         if (chunk_is_token(prev, CT_TYPE))
+         if (prev->Is(CT_TYPE))
          {
             // Issue # 1002
-            if (!pc->flags.test(PCF_IN_TEMPLATE))
+            if (!pc->TestFlags(PCF_IN_TEMPLATE))
             {
-               set_chunk_type(pc, CT_BYREF);
+               pc->SetType(CT_BYREF);
             }
          }
       }
@@ -1152,11 +1162,11 @@ void tokenize_cleanup(void)
        * HACK: treat try followed by a colon as a qualifier to handle this:
        *   A::A(int) try : B() { } catch (...) { }
        */
-      if (  chunk_is_token(pc, CT_TRY)
-         && chunk_is_str(pc, "try")
-         && chunk_is_token(next, CT_COLON))
+      if (  pc->Is(CT_TRY)
+         && pc->IsString("try")
+         && next->Is(CT_COLON))
       {
-         set_chunk_type(pc, CT_QUALIFIER);
+         pc->SetType(CT_QUALIFIER);
       }
 
       /*
@@ -1164,17 +1174,17 @@ void tokenize_cleanup(void)
        * a qualifier.
        */
       if (  language_is_set(LANG_JAVA)
-         && chunk_is_token(pc, CT_SYNCHRONIZED)
-         && next->type != CT_PAREN_OPEN)
+         && pc->Is(CT_SYNCHRONIZED)
+         && next->IsNot(CT_PAREN_OPEN))
       {
-         set_chunk_type(pc, CT_QUALIFIER);
+         pc->SetType(CT_QUALIFIER);
       }
 
       // change CT_DC_MEMBER + CT_FOR into CT_DC_MEMBER + CT_FUNC_CALL
-      if (  chunk_is_token(pc, CT_FOR)
-         && chunk_is_token(pc->prev, CT_DC_MEMBER))
+      if (  pc->Is(CT_FOR)
+         && pc->GetPrev()->Is(CT_DC_MEMBER))
       {
-         set_chunk_type(pc, CT_FUNC_CALL);
+         pc->SetType(CT_FUNC_CALL);
       }
       // TODO: determine other stuff here
 
@@ -1192,19 +1202,19 @@ bool invalid_open_angle_template(Chunk *prev)
       return(false);
    }
    // A template requires a word/type right before the open angle
-   return(  prev->type != CT_WORD
-         && prev->type != CT_TYPE
-         && prev->type != CT_COMMA
-         && prev->type != CT_QUALIFIER
-         && prev->type != CT_OPERATOR_VAL
-         && get_chunk_parent_type(prev) != CT_OPERATOR);
+   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->orig_line, start->orig_col);
+   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);
 
@@ -1215,7 +1225,7 @@ static void check_template(Chunk *start, bool in_type_cast)
    Chunk *end;
    Chunk *pc;
 
-   if (chunk_is_token(prev, CT_TEMPLATE))
+   if (prev->Is(CT_TEMPLATE))
    {
       LOG_FMT(LTEMPL, "%s(%d): CT_TEMPLATE:\n", __func__, __LINE__);
 
@@ -1228,49 +1238,49 @@ static void check_template(Chunk *start, bool in_type_cast)
            pc = pc->GetNextNcNnl(E_Scope::PREPROC))
       {
          LOG_FMT(LTEMPL, "%s(%d): type is %s, level is %zu\n",
-                 __func__, __LINE__, get_token_name(pc->type), level);
+                 __func__, __LINE__, get_token_name(pc->GetType()), level);
 
-         if (  (pc->str[0] == '>')
+         if (  (pc->GetStr()[0] == '>')
             && (pc->Len() > 1))
          {
-            if (pc->str[1] == '=')                         // Issue #1462 and #2565
+            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->orig_line, pc->orig_col);
+               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->orig_line, pc->orig_col);
+               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 (chunk_is_token(pc, CT_DECLTYPE))
+         if (pc->Is(CT_DECLTYPE))
          {
             flag_cpp_decltype(pc);
          }
-         else if (chunk_is_token(pc, CT_PAREN_OPEN))
+         else if (pc->Is(CT_PAREN_OPEN))
          {
             ++parens;
          }
-         else if (chunk_is_token(pc, CT_PAREN_CLOSE))
+         else if (pc->Is(CT_PAREN_CLOSE))
          {
             --parens;
          }
 
          if (parens == 0)
          {
-            if (chunk_is_str(pc, "<"))
+            if (pc->IsString("<"))
             {
                level++;
             }
-            else if (chunk_is_str(pc, ">"))
+            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->orig_line, pc->orig_col);
+                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                   log_flush(true);
                   exit(EX_SOFTWARE);
                }
@@ -1312,12 +1322,12 @@ static void check_template(Chunk *start, bool in_type_cast)
       if (invalid_open_angle_template(prev))
       {
          LOG_FMT(LTEMPL, "%s(%d): - after type %s + ( - Not a template\n",
-                 __func__, __LINE__, get_token_name(prev->type));
-         set_chunk_type(start, CT_COMPARE);
+                 __func__, __LINE__, get_token_name(prev->GetType()));
+         start->SetType(CT_COMPARE);
          return;
       }
-      LOG_FMT(LTEMPL, "%s(%d): - prev->type is %s -\n",
-              __func__, __LINE__, get_token_name(prev->type));
+      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;
@@ -1326,47 +1336,47 @@ static void check_template(Chunk *start, bool in_type_cast)
 
       while (pc->IsNotNullChunk())
       {
-         if (  (  chunk_is_token(pc, CT_SEMICOLON)
+         if (  (  pc->Is(CT_SEMICOLON)
                && hit_semicolon)
-            || chunk_is_token(pc, CT_SQUARE_CLOSE))
+            || pc->Is(CT_SQUARE_CLOSE))
          {
             break;
          }
 
-         if (chunk_is_token(pc, CT_DECLTYPE))
+         if (pc->Is(CT_DECLTYPE))
          {
             flag_cpp_decltype(pc);
          }
 
-         if (chunk_is_token(pc, CT_BRACE_OPEN))
+         if (pc->Is(CT_BRACE_OPEN))
          {
-            if (  !pc->flags.test(PCF_IN_DECLTYPE)
-               || !detect_cpp_braced_init_list(pc->prev, pc))
+            if (  !pc->TestFlags(PCF_IN_DECLTYPE)
+               || !detect_cpp_braced_init_list(pc->GetPrev(), pc))
             {
                break;
             }
-            flag_cpp_braced_init_list(pc->prev, pc);
+            flag_cpp_braced_init_list(pc->GetPrev(), pc);
          }
 
-         if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-            && get_chunk_parent_type(pc) != CT_BRACED_INIT_LIST
-            && !pc->flags.test(PCF_IN_DECLTYPE))
+         if (  pc->Is(CT_BRACE_CLOSE)
+            && pc->GetParentType() != CT_BRACED_INIT_LIST
+            && !pc->TestFlags(PCF_IN_DECLTYPE))
          {
             break;
          }
 
-         if (  chunk_is_token(pc, CT_SEMICOLON)
+         if (  pc->Is(CT_SEMICOLON)
             && !hit_semicolon)
          {
             hit_semicolon = true;
          }
 
-         if (  (  (  chunk_is_token(pc, CT_IF)
-                  || chunk_is_token(pc, CT_RETURN)
-                  || chunk_is_token(pc, CT_WHILE)
-                  || chunk_is_token(pc, CT_WHILE_OF_DO))
+         if (  (  (  pc->Is(CT_IF)
+                  || pc->Is(CT_RETURN)
+                  || pc->Is(CT_WHILE)
+                  || pc->Is(CT_WHILE_OF_DO))
                && !hit_semicolon)
-            || (  chunk_is_token(pc, CT_FOR)
+            || (  pc->Is(CT_FOR)
                && hit_semicolon))
          {
             in_if = true;
@@ -1390,42 +1400,42 @@ static void check_template(Chunk *start, bool in_type_cast)
       {
          constexpr static auto LCURRENT = LTEMPL;
 
-         LOG_FMT(LTEMPL, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, type is %s, num_tokens is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), num_tokens);
+         LOG_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 (chunk_is_token(pc, CT_BRACE_OPEN))                     // Issue #2886
+         if (pc->Is(CT_BRACE_OPEN))                     // Issue #2886
          {
             // look for the closing brace
-            Chunk *A = chunk_skip_to_match(pc);
-            LOG_FMT(LTEMPL, "%s(%d): A->orig_line is %zu, A->orig_col is %zu, type is %s\n",
-                    __func__, __LINE__, A->orig_line, A->orig_col, get_token_name(A->type));
+            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->str[0] == '>')
+            && (pc->GetStr()[0] == '>')
             && (pc->Len() > 1)
             && (  options::tok_split_gte()
-               || (  (  chunk_is_str(pc, ">>")
-                     || chunk_is_str(pc, ">>>"))
+               || (  (  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->orig_line, pc->orig_col);
+            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 (chunk_is_str(pc, "<"))
+         if (pc->IsString("<"))
          {
             if (  num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN)
-               && invalid_open_angle_template(pc->prev))
+               && invalid_open_angle_template(pc->GetPrev()))
             {
-               set_chunk_type(pc, CT_COMPARE); // Issue #3127
+               pc->SetType(CT_COMPARE); // Issue #3127
             }
             else
             {
@@ -1433,7 +1443,7 @@ static void check_template(Chunk *start, bool in_type_cast)
                num_tokens++;
             }
          }
-         else if (chunk_is_str(pc, ">"))
+         else if (pc->IsString(">"))
          {
             if (num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN))
             {
@@ -1449,35 +1459,35 @@ static void check_template(Chunk *start, bool in_type_cast)
             }
          }
          else if (  in_if
-                 && (  chunk_is_token(pc, CT_BOOL)
-                    || chunk_is_token(pc, CT_COMPARE)))
+                 && (  pc->Is(CT_BOOL)
+                    || pc->Is(CT_COMPARE)))
          {
             break;
          }
-         else if (chunk_is_token(pc, CT_BRACE_OPEN))
+         else if (pc->Is(CT_BRACE_OPEN))
          {
-            if (  !pc->flags.test(PCF_IN_DECLTYPE)
-               || !detect_cpp_braced_init_list(pc->prev, pc))
+            if (  !pc->TestFlags(PCF_IN_DECLTYPE)
+               || !detect_cpp_braced_init_list(pc->GetPrev(), pc))
             {
                break;
             }
             auto brace_open  = pc->GetNextNcNnl();
-            auto brace_close = chunk_skip_to_match(brace_open);
+            auto brace_close = brace_open->GetClosingParen();
 
-            set_chunk_parent(brace_open, CT_BRACED_INIT_LIST);
-            set_chunk_parent(brace_close, CT_BRACED_INIT_LIST);
+            brace_open->SetParentType(CT_BRACED_INIT_LIST);
+            brace_close->SetParentType(CT_BRACED_INIT_LIST);
          }
-         else if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-                 && get_chunk_parent_type(pc) != CT_BRACED_INIT_LIST
-                 && !pc->flags.test(PCF_IN_DECLTYPE))
+         else if (  pc->Is(CT_BRACE_CLOSE)
+                 && pc->GetParentType() != CT_BRACED_INIT_LIST
+                 && !pc->TestFlags(PCF_IN_DECLTYPE))
          {
             break;
          }
-         else if (chunk_is_token(pc, CT_SEMICOLON))
+         else if (pc->Is(CT_SEMICOLON))
          {
             break;
          }
-         else if (chunk_is_token(pc, CT_PAREN_OPEN))
+         else if (pc->Is(CT_PAREN_OPEN))
          {
             if (num_tokens >= max_token_count - 1)
             {
@@ -1486,17 +1496,17 @@ static void check_template(Chunk *start, bool in_type_cast)
             tokens[num_tokens] = CT_PAREN_OPEN;
             num_tokens++;
          }
-         else if (  chunk_is_token(pc, CT_QUESTION)                    // Issue #2949
+         else if (  pc->Is(CT_QUESTION)                    // Issue #2949
                  && language_is_set(LANG_CPP))
          {
             break;
          }
-         else if (chunk_is_token(pc, CT_PAREN_CLOSE))
+         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->orig_line, pc->orig_col);
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                log_flush(true);
                exit(EX_SOFTWARE);
             }
@@ -1512,40 +1522,40 @@ static void check_template(Chunk *start, bool in_type_cast)
       end = pc;
    }
 
-   if (chunk_is_token(end, CT_ANGLE_CLOSE))
+   if (end->Is(CT_ANGLE_CLOSE))
    {
       pc = end->GetNextNcNnl(E_Scope::PREPROC);
 
       if (  pc->IsNullChunk()
-         || pc->type != CT_NUMBER)
+         || 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->orig_line, start->orig_col);
-         LOG_FMT(LTEMPL, "%s(%d):     to   orig_line %zu, orig_col %zu\n",
-                 __func__, __LINE__, end->orig_line, end->orig_col);
-         set_chunk_parent(start, CT_TEMPLATE);
+         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);
 
-         set_chunk_parent(end, CT_TEMPLATE);
-         chunk_flags_set(end, PCF_IN_TEMPLATE);
+         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->type) : "<null>");
-   set_chunk_type(start, CT_COMPARE);
+           __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->orig_line, start->orig_col);
-   LOG_FMT(LTEMPL, "%s(%d):     to   orig_line %zu, orig_col %zu\n",
-           __func__, __LINE__, end->orig_line, end->orig_col);
+   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;
@@ -1564,20 +1574,20 @@ static void check_template_arg(Chunk *start, Chunk *end)
    {
       Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
       // a test "if (next == nullptr)" is not necessary
-      chunk_flags_set(pc, PCF_IN_TEMPLATE);
+      pc->SetFlagBits(PCF_IN_TEMPLATE);
 
-      if (  chunk_is_token(pc, CT_DECLTYPE)
-         || chunk_is_token(pc, CT_SIZEOF))
+      if (  pc->Is(CT_DECLTYPE)
+         || pc->Is(CT_SIZEOF))
       {
          expressionIsNumeric = true;
          break;
       }
 
-      if (next->type != CT_PAREN_OPEN)
+      if (next->IsNot(CT_PAREN_OPEN))
       {
-         if (  chunk_is_token(pc, CT_NUMBER)
-            || chunk_is_token(pc, CT_ARITH)
-            || chunk_is_token(pc, CT_SHIFT))
+         if (  pc->Is(CT_NUMBER)
+            || pc->Is(CT_ARITH)
+            || pc->Is(CT_SHIFT))
          {
             expressionIsNumeric = true;
             break;
@@ -1597,15 +1607,15 @@ static void check_template_arg(Chunk *start, Chunk *end)
       {
          Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
          // a test "if (next == nullptr)" is not necessary
-         chunk_flags_set(pc, PCF_IN_TEMPLATE);
+         pc->SetFlagBits(PCF_IN_TEMPLATE);
 
          Chunk *prev  = pc->GetPrevNcNnl(E_Scope::PREPROC);
          Chunk *prev2 = prev->GetPrevNcNnl(E_Scope::PREPROC);
 
-         if (  chunk_is_token(prev, CT_ELLIPSIS)                 // Issue #3309
-            && chunk_is_token(prev2, CT_TYPENAME))
+         if (  prev->Is(CT_ELLIPSIS)                 // Issue #3309
+            && prev2->Is(CT_TYPENAME))
          {
-            set_chunk_type(pc, CT_PARAMETER_PACK);
+            pc->SetType(CT_PARAMETER_PACK);
          }
          else
          {
@@ -1628,7 +1638,7 @@ static void check_template_args(Chunk *start, Chunk *end)
         pc->IsNotNullChunk() && pc != end;
         pc = pc->GetNextNcNnl(E_Scope::PREPROC))
    {
-      switch (pc->type)
+      switch (pc->GetType())
       {
       case CT_COMMA:
 
@@ -1642,7 +1652,7 @@ static void check_template_args(Chunk *start, Chunk *end)
 
       case CT_ANGLE_OPEN:
       case CT_PAREN_OPEN:
-         tokens.push_back(pc->type);
+         tokens.push_back(pc->GetType());
          break;
 
       case CT_ANGLE_CLOSE:
@@ -1675,33 +1685,33 @@ static void check_template_args(Chunk *start, Chunk *end)
 
 static void cleanup_objc_property(Chunk *start)
 {
-   assert(chunk_is_token(start, CT_OC_PROPERTY));
+   assert(start->Is(CT_OC_PROPERTY));
 
-   Chunk *open_paren = start->GetNextType(CT_PAREN_OPEN, start->level);
+   Chunk *open_paren = start->GetNextType(CT_PAREN_OPEN, start->GetLevel());
 
    if (open_paren->IsNullChunk())
    {
-      LOG_FMT(LTEMPL, "%s(%d): Property is not followed by openning paren\n", __func__, __LINE__);
+      LOG_FMT(LTEMPL, "%s(%d): Property is not followed by opening paren\n", __func__, __LINE__);
       return;
    }
-   set_chunk_parent(open_paren, start->type);
+   open_paren->SetParentType(start->GetType());
 
-   Chunk *tmp = start->GetNextType(CT_PAREN_CLOSE, start->level);
+   Chunk *tmp = start->GetNextType(CT_PAREN_CLOSE, start->GetLevel());
 
    if (tmp->IsNotNullChunk())
    {
-      set_chunk_parent(tmp, start->type);
+      tmp->SetParentType(start->GetType());
       tmp = tmp->GetNextNcNnl();
 
       if (tmp->IsNotNullChunk())
       {
-         chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
+         tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
 
-         tmp = tmp->GetNextType(CT_SEMICOLON, start->level);
+         tmp = tmp->GetNextType(CT_SEMICOLON, start->GetLevel());
 
          if (tmp->IsNotNullChunk())
          {
-            set_chunk_parent(tmp, start->type);
+            tmp->SetParentType(start->GetType());
          }
       }
    }
@@ -1712,34 +1722,33 @@ static void cleanup_objc_property(Chunk *start)
 
 static void mark_selectors_in_property_with_open_paren(Chunk *open_paren)
 {
-   assert(chunk_is_token(open_paren, CT_PAREN_OPEN));
+   assert(open_paren->Is(CT_PAREN_OPEN));
 
    Chunk *tmp = open_paren;
 
-   while (  tmp != nullptr
-         && tmp->type != CT_PAREN_CLOSE)
+   while (tmp->IsNot(CT_PAREN_CLOSE))
    {
-      if (  chunk_is_token(tmp, CT_WORD)
-         && (  chunk_is_str(tmp, "setter")
-            || chunk_is_str(tmp, "getter")))
+      if (  tmp->Is(CT_WORD)
+         && (  tmp->IsString("setter")
+            || tmp->IsString("getter")))
       {
-         tmp = tmp->next;
+         tmp = tmp->GetNext();
 
-         while (  tmp != nullptr
-               && tmp->type != CT_COMMA
-               && tmp->type != CT_PAREN_CLOSE)
+         while (  tmp->IsNotNullChunk()
+               && tmp->IsNot(CT_COMMA)
+               && tmp->IsNot(CT_PAREN_CLOSE))
          {
-            if (  chunk_is_token(tmp, CT_WORD)
-               || chunk_is_str(tmp, ":"))
+            if (  tmp->Is(CT_WORD)
+               || tmp->IsString(":"))
             {
-               set_chunk_type(tmp, CT_OC_SEL_NAME);
+               tmp->SetType(CT_OC_SEL_NAME);
             }
-            tmp = tmp->next;
+            tmp = tmp->GetNext();
          }
       }
       else
       {
-         tmp = tmp->next;
+         tmp = tmp->GetNext();
       }
    }
 }
@@ -1747,20 +1756,21 @@ static void mark_selectors_in_property_with_open_paren(Chunk *open_paren)
 
 static void mark_attributes_in_property_with_open_paren(Chunk *open_paren)
 {
-   assert(chunk_is_token(open_paren, CT_PAREN_OPEN));
+   assert(open_paren->Is(CT_PAREN_OPEN));
 
    Chunk *tmp = open_paren;
 
-   while (  tmp != nullptr
-         && tmp->type != CT_PAREN_CLOSE)
+   while (tmp->IsNot(CT_PAREN_CLOSE))
    {
-      if (  (  chunk_is_token(tmp, CT_COMMA)
-            || chunk_is_token(tmp, CT_PAREN_OPEN))
-         && (  chunk_is_token(tmp->next, CT_WORD)
-            || chunk_is_token(tmp->next, CT_TYPE)))
+      Chunk *next = tmp->GetNext();
+
+      if (  (  tmp->Is(CT_COMMA)
+            || tmp->Is(CT_PAREN_OPEN))
+         && (  next->Is(CT_WORD)
+            || next->Is(CT_TYPE)))
       {
-         set_chunk_type(tmp->next, CT_OC_PROPERTY_ATTR);
+         next->SetType(CT_OC_PROPERTY_ATTR);
       }
-      tmp = tmp->next;
+      tmp = next;
    }
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.h
index 1a75cde9..1789ee26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.h
@@ -19,10 +19,10 @@
  * Note that level info is not yet available, so it is OK to do all
  * processing that doesn't need to know level info. (that's very little!)
  */
-void tokenize_cleanup(void);
+void tokenize_cleanup();
 
 
-void tokenize_trailing_return_types(void);
+void tokenize_trailing_return_types();
 
 
 void split_off_angle_close(Chunk *pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.cpp
new file mode 100644
index 00000000..352b4efb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.cpp
@@ -0,0 +1,75 @@
+#include "options.h"
+
+
+int unc_fix_ctype(int ch)
+{
+   if (  ch >= -1
+      && ch <= 255)
+   {
+      return(ch);
+   }
+   return(0); // Issue #3025
+}
+
+
+int unc_isspace(int ch)
+{
+   if (  (ch == 12) // Issue #2386
+      && uncrustify::options::use_form_feed_no_more_as_whitespace_character())
+   {
+      return(0);
+   }
+   else
+   {
+      return(isspace(unc_fix_ctype(ch)));
+   }
+}
+
+
+int unc_isprint(int ch)
+{
+   return(isprint(unc_fix_ctype(ch)));
+}
+
+
+int unc_isalpha(int ch)
+{
+   return(isalpha(unc_fix_ctype(ch)));
+}
+
+
+int unc_isalnum(int ch)
+{
+   return(isalnum(unc_fix_ctype(ch)));
+}
+
+
+int unc_toupper(int ch)
+{
+   return(toupper(unc_fix_ctype(ch)));
+}
+
+
+int unc_tolower(int ch)
+{
+   return(tolower(unc_fix_ctype(ch)));
+}
+
+
+int unc_isxdigit(int ch)
+{
+   return(isxdigit(unc_fix_ctype(ch)));
+}
+
+
+int unc_isdigit(int ch)
+{
+   return(isdigit(unc_fix_ctype(ch)));
+}
+
+
+int unc_isupper(int ch)
+{
+   return(  isalpha(unc_fix_ctype(ch))
+         && (unc_toupper(unc_fix_ctype(ch)) == ch));
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.h
new file mode 100644
index 00000000..8cfcbf3b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.h
@@ -0,0 +1,49 @@
+/**
+ * @file unc_ctype.h
+ * The ctype function are only required to handle values 0-255 and EOF.
+ * A char is sign-extended when cast to an int.
+ * With some C libraries, these values cause a crash.
+ * These wrappers will properly handle all char values.
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#ifndef UNC_CTYPE_H_INCLUDED
+#define UNC_CTYPE_H_INCLUDED
+
+#include "options.h"
+
+#include <cctype>                    // to get std::tolower
+
+//! Test anything EOF (-1) to 0-255
+int unc_fix_ctype(int ch);
+
+//! check if a character is a space
+int unc_isspace(int ch);
+
+//! check if a character is a printing character
+int unc_isprint(int ch);
+
+//! check if a character is an alphabetic character (a letter).
+int unc_isalpha(int ch);
+
+//! check if a character is an alphanumeric character.
+int unc_isalnum(int ch);
+
+//! convert a character to upper case
+int unc_toupper(int ch);
+
+//! convert a character to lower case
+int unc_tolower(int ch);
+
+//! check if a character is a hexadecimal digit
+int unc_isxdigit(int ch);
+
+//! check if a character is a decimal digit
+int unc_isdigit(int ch);
+
+//! check if a character is upper case
+int unc_isupper(int ch);
+
+#endif /* UNC_CTYPE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.cpp
index 1f96a67c..1f96a67c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.h
index dd678f16..dd678f16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.cpp
index 20aa4b99..47425a83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.cpp
@@ -16,8 +16,8 @@
 /*
  * the test suite Coveralls: https://coveralls.io
  * will complains because these functions are only
- * used at developement time.
- * Don't worry about unsed lines for the functions:
+ * used at development time.
+ * Don't worry about unused lines for the functions:
  *   prot_the_line
  *   prot_the_source
  *   examine_Data
@@ -31,11 +31,11 @@ static size_t tokenCounter;
 
 /* protocol of the line
  * examples:
- *   prot_the_line(__func__, __LINE__, pc->orig_line, 0);
+ *   prot_the_line(__func__, __LINE__, pc->GetOrigLine(), 0);
  *   prot_the_line(__func__, __LINE__, 0, 0);
  *   prot_the_line(__func__, __LINE__, 6, 5);
  *   prot_the_source(__LINE__);
- *   log_pcf_flags(LSYS, pc->flags);
+ *   log_pcf_flags(LSYS, pc->GetFlags());
  *
  * if actual_line is zero, use the option debug_line_number_to_protocol.
  * if the value is zero, don't make any protocol and return.
@@ -71,36 +71,36 @@ void prot_the_line_pc(Chunk *pc_sub, const char *func_name, int theLine, unsigne
 
    for (Chunk *pc = pc_sub; pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (pc->orig_line == actual_line)
+      if (pc->GetOrigLine() == actual_line)
       {
          tokenCounter++;
 
          if (  partNumber == 0
             || partNumber == tokenCounter)
          {
-            LOG_FMT(LGUY, " orig_line is %d, (%zu) ", actual_line, tokenCounter);
+            LOG_FMT(LGUY, " orig line is %d, (%zu) ", actual_line, tokenCounter);
 
-            if (chunk_is_token(pc, CT_VBRACE_OPEN))
+            if (pc->Is(CT_VBRACE_OPEN))
             {
                LOG_FMT(LGUY, "<VBRACE_OPEN>, ");
             }
-            else if (chunk_is_token(pc, CT_NEWLINE))
+            else if (pc->Is(CT_NEWLINE))
             {
-               LOG_FMT(LGUY, "<NL>(nl_count is %zu), ", pc->nl_count);
+               LOG_FMT(LGUY, "<NL>(new line count is %zu), ", pc->GetNlCount());
             }
-            else if (chunk_is_token(pc, CT_VBRACE_CLOSE))
+            else if (pc->Is(CT_VBRACE_CLOSE))
             {
                LOG_FMT(LGUY, "<CT_VBRACE_CLOSE>, ");
             }
-            else if (chunk_is_token(pc, CT_VBRACE_OPEN))
+            else if (pc->Is(CT_VBRACE_OPEN))
             {
                LOG_FMT(LGUY, "<CT_VBRACE_OPEN>, ");
             }
-            else if (chunk_is_token(pc, CT_SPACE))
+            else if (pc->Is(CT_SPACE))
             {
                LOG_FMT(LGUY, "<CT_SPACE>, ");
             }
-            else if (chunk_is_token(pc, CT_IGNORED))
+            else if (pc->Is(CT_IGNORED))
             {
                LOG_FMT(LGUY, "<IGNORED> ");
             }
@@ -108,31 +108,31 @@ void prot_the_line_pc(Chunk *pc_sub, const char *func_name, int theLine, unsigne
             {
                LOG_FMT(LGUY, "Text() '%s', ", pc->Text());
             }
-            LOG_FMT(LGUY, " column is %zu, pp_level is %zu, type is %s, parent_type is %s, orig_col is %zu,",
-                    pc->column, pc->pp_level, get_token_name(pc->type),
-                    get_token_name(get_chunk_parent_type(pc)), pc->orig_col);
+            LOG_FMT(LGUY, " column is %zu, pp level is %zu, type is %s, parent type is %s, orig col is %zu,",
+                    pc->GetColumn(), pc->GetPpLevel(), get_token_name(pc->GetType()),
+                    get_token_name(pc->GetParentType()), pc->GetOrigCol());
 
-            if (chunk_is_token(pc, CT_IGNORED))
+            if (pc->Is(CT_IGNORED))
             {
                LOG_FMT(LGUY, "\n");
             }
             else
             {
-               LOG_FMT(LGUY, " pc->flags: ");
-               log_pcf_flags(LGUY, pc->flags);
+               LOG_FMT(LGUY, " pc->GetFlags(): ");
+               log_pcf_flags(LGUY, pc->GetFlags());
             }
 
-            if (pc->tracking != nullptr)
+            if (pc->GetTrackingData() != nullptr)
             {
                LOG_FMT(LGUY, " Tracking info are: \n");
-               LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->tracking->size());
+               LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->GetTrackingData()->size());
 
-               for (size_t track = 0; track < pc->tracking->size(); track++)
+               for (size_t track = 0; track < pc->GetTrackingData()->size(); track++)
                {
-                  track_list *A       = pc->tracking;
-                  Track_nr   B        = A->at(track);
-                  size_t     Bfirst   = B.first;
-                  char       *Bsecond = B.second;
+                  const track_list *A       = pc->GetTrackingData();
+                  const Track_nr   B        = A->at(track);
+                  size_t           Bfirst   = B.first;
+                  char             *Bsecond = B.second;
 
                   LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
                   LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
@@ -158,31 +158,31 @@ void prot_all_lines(const char *func_name, int theLine)
    {
       tokenCounter++;
 
-      LOG_FMT(LGUY, " orig_line is %zu,%zu, pp_level is %zu, ", lineNumber, tokenCounter, pc->pp_level);
+      LOG_FMT(LGUY, " orig line is %zu,%zu, pp level is %zu, ", lineNumber, tokenCounter, pc->GetPpLevel());
 
-      if (chunk_is_token(pc, CT_VBRACE_OPEN))
+      if (pc->Is(CT_VBRACE_OPEN))
       {
          LOG_FMT(LGUY, "<VBRACE_OPEN>, ");
       }
-      else if (chunk_is_token(pc, CT_NEWLINE))
+      else if (pc->Is(CT_NEWLINE))
       {
-         LOG_FMT(LGUY, "<NL>(nl_count is %zu), ", pc->nl_count);
+         LOG_FMT(LGUY, "<NL>(new line count is %zu), ", pc->GetNlCount());
          tokenCounter = 0;
-         lineNumber   = lineNumber + pc->nl_count;
+         lineNumber   = lineNumber + pc->GetNlCount();
       }
-      else if (chunk_is_token(pc, CT_VBRACE_CLOSE))
+      else if (pc->Is(CT_VBRACE_CLOSE))
       {
          LOG_FMT(LGUY, "<CT_VBRACE_CLOSE>, ");
       }
-      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
+      else if (pc->Is(CT_VBRACE_OPEN))
       {
          LOG_FMT(LGUY, "<CT_VBRACE_OPEN>, ");
       }
-      else if (chunk_is_token(pc, CT_SPACE))
+      else if (pc->Is(CT_SPACE))
       {
          LOG_FMT(LGUY, "<CT_SPACE>, ");
       }
-      else if (chunk_is_token(pc, CT_IGNORED))
+      else if (pc->Is(CT_IGNORED))
       {
          LOG_FMT(LGUY, "<IGNORED> ");
       }
@@ -191,7 +191,7 @@ void prot_all_lines(const char *func_name, int theLine)
          LOG_FMT(LGUY, "Text() '%s', ", pc->Text());
       }
       LOG_FMT(LGUY, " column is %zu, type is %s\n",
-              pc->column, get_token_name(pc->type));
+              pc->GetColumn(), get_token_name(pc->GetType()));
    }
 } // prot_all_lines
 
@@ -218,12 +218,12 @@ void examine_Data(const char *func_name, int theLine, int what)
 
       for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
-         if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
-            || chunk_is_token(pc, CT_TSQUARE))
+         if (  pc->Is(CT_SQUARE_CLOSE)
+            || pc->Is(CT_TSQUARE))
          {
             LOG_FMT(LGUY, "\n");
             LOG_FMT(LGUY, "1:(%d),", theLine);
-            LOG_FMT(LGUY, "%s, orig_col=%zu, orig_col_end=%zu\n", pc->Text(), pc->orig_col, pc->orig_col_end);
+            LOG_FMT(LGUY, "%s, orig col=%zu, orig col end=%zu\n", pc->Text(), pc->GetOrigCol(), pc->GetOrigColEnd());
          }
       }
 
@@ -234,15 +234,15 @@ void examine_Data(const char *func_name, int theLine, int what)
 
       for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
-         if (pc->orig_line == 7)
+         if (pc->GetOrigLine() == 7)
          {
-            if (chunk_is_token(pc, CT_NEWLINE))
+            if (pc->Is(CT_NEWLINE))
             {
-               LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->orig_line, pc->orig_col);
+               LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->GetOrigLine(), pc->GetOrigCol());
             }
             else
             {
-               LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->orig_line, pc->Text(), get_token_name(pc->type), pc->orig_col, pc->column);
+               LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->GetOrigLine(), pc->Text(), get_token_name(pc->GetType()), pc->GetOrigCol(), pc->GetColumn());
             }
          }
       }
@@ -254,13 +254,13 @@ void examine_Data(const char *func_name, int theLine, int what)
 
       for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
-         if (chunk_is_token(pc, CT_NEWLINE))
+         if (pc->Is(CT_NEWLINE))
          {
-            LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->orig_line, pc->orig_col);
+            LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->GetOrigLine(), pc->GetOrigCol());
          }
          else
          {
-            LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->orig_line, pc->Text(), get_token_name(pc->type), pc->orig_col, pc->column);
+            LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->GetOrigLine(), pc->Text(), get_token_name(pc->GetType()), pc->GetOrigCol(), pc->GetColumn());
          }
       }
 
@@ -271,15 +271,15 @@ void examine_Data(const char *func_name, int theLine, int what)
 
       for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
-         if (pc->orig_line == 6)
+         if (pc->GetOrigLine() == 6)
          {
-            if (chunk_is_token(pc, CT_NEWLINE))
+            if (pc->Is(CT_NEWLINE))
             {
-               LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->orig_line, pc->orig_col);
+               LOG_FMT(LGUY, "(%zu)<NL> col=%zu\n\n", pc->GetOrigLine(), pc->GetOrigCol());
             }
             else
             {
-               LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->orig_line, pc->Text(), get_token_name(pc->type), pc->orig_col, pc->column);
+               LOG_FMT(LGUY, "(%zu)%s %s, col=%zu, column=%zu\n", pc->GetOrigLine(), pc->Text(), get_token_name(pc->GetType()), pc->GetOrigCol(), pc->GetColumn());
             }
          }
       }
@@ -311,52 +311,52 @@ void dump_out(unsigned int type)
       for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
          fprintf(D_file, "[%p]\n", pc);
-         fprintf(D_file, "  type %s\n", get_token_name(pc->type));
-         fprintf(D_file, "  orig_line %zu\n", pc->orig_line);
-         fprintf(D_file, "  orig_col %zu\n", pc->orig_col);
-         fprintf(D_file, "  orig_col_end %zu\n", pc->orig_col_end);
+         fprintf(D_file, "  type %s\n", get_token_name(pc->GetType()));
+         fprintf(D_file, "  orig line %zu\n", pc->GetOrigLine());
+         fprintf(D_file, "  orig col %zu\n", pc->GetOrigCol());
+         fprintf(D_file, "  orig col end %zu\n", pc->GetOrigColEnd());
 
-         if (pc->orig_prev_sp != 0)
+         if (pc->GetOrigPrevSp() != 0)
          {
-            fprintf(D_file, "  orig_prev_sp %u\n", pc->orig_prev_sp);
+            fprintf(D_file, "  orig prev sp %zu\n", pc->GetOrigPrevSp());
          }
 
-         if (pc->column != 0)
+         if (pc->GetColumn() != 0)
          {
-            fprintf(D_file, "  column %zu\n", pc->column);
+            fprintf(D_file, "  column %zu\n", pc->GetColumn());
          }
 
-         if (pc->column_indent != 0)
+         if (pc->GetColumnIndent() != 0)
          {
-            fprintf(D_file, "  column_indent %zu\n", pc->column_indent);
+            fprintf(D_file, "  column indent %zu\n", pc->GetColumnIndent());
          }
 
-         if (pc->nl_count != 0)
+         if (pc->GetNlCount() != 0)
          {
-            fprintf(D_file, "  nl_count %zu\n", pc->nl_count);
+            fprintf(D_file, "  nl_count %zu\n", pc->GetNlCount());
          }
 
-         if (pc->level != 0)
+         if (pc->GetLevel() != 0)
          {
-            fprintf(D_file, "  level %zu\n", pc->level);
+            fprintf(D_file, "  level %zu\n", pc->GetLevel());
          }
 
-         if (pc->brace_level != 0)
+         if (pc->GetBraceLevel() != 0)
          {
-            fprintf(D_file, "  brace_level %zu\n", pc->brace_level);
+            fprintf(D_file, "  brace level %zu\n", pc->GetBraceLevel());
          }
 
-         if (pc->pp_level != 0)
+         if (pc->GetPpLevel() != 0)
          {
-            fprintf(D_file, "  pp_level %zu\n", pc->pp_level);
+            fprintf(D_file, "  pp level %zu\n", pc->GetPpLevel());
          }
 
-         if (pc->after_tab != 0)
+         if (pc->GetAfterTab() != 0)
          {
-            fprintf(D_file, "  after_tab %d\n", pc->after_tab);
+            fprintf(D_file, "  after tab %d\n", pc->GetAfterTab());
          }
 
-         if (pc->type != CT_NEWLINE)
+         if (pc->IsNot(CT_NEWLINE))
          {
             fprintf(D_file, "  Text %s\n", pc->Text());
          }
@@ -401,7 +401,7 @@ void dump_in(unsigned int type)
             {
                aNewChunkIsFound = false;
                // add the chunk in the list
-               chunk_add_before(&chunk, nullptr);
+               chunk.CopyAndAddBefore(Chunk::NullChunkPtr);
                chunk.Reset();
                aNewChunkIsFound = true;
                continue;
@@ -421,37 +421,37 @@ void dump_in(unsigned int type)
             if (strcasecmp(parts[0], "type") == 0)
             {
                E_Token tokenName = find_token_name(parts[1]);
-               set_chunk_type(&chunk, tokenName);
+               chunk.SetType(tokenName);
             }
-            else if (strcasecmp(parts[0], "orig_line") == 0)
+            else if (strcasecmp(parts[0], "orig line") == 0)
             {
-               chunk.orig_line = strtol(parts[1], nullptr, 0);
+               chunk.SetOrigLine(strtol(parts[1], nullptr, 0));
             }
-            else if (strcasecmp(parts[0], "orig_col") == 0)
+            else if (strcasecmp(parts[0], "orig col") == 0)
             {
-               chunk.orig_col = strtol(parts[1], nullptr, 0);
+               chunk.SetOrigCol(strtol(parts[1], nullptr, 0));
             }
-            else if (strcasecmp(parts[0], "orig_col_end") == 0)
+            else if (strcasecmp(parts[0], "orig col end") == 0)
             {
-               chunk.orig_col_end = strtol(parts[1], nullptr, 0);
+               chunk.SetOrigColEnd(strtol(parts[1], nullptr, 0));
             }
-            else if (strcasecmp(parts[0], "orig_prev_sp") == 0)
+            else if (strcasecmp(parts[0], "orig prev sp") == 0)
             {
-               chunk.orig_prev_sp = strtol(parts[1], nullptr, 0);
+               chunk.SetOrigPrevSp(strtol(parts[1], nullptr, 0));
             }
             else if (strcasecmp(parts[0], "column") == 0)
             {
-               chunk.column = strtol(parts[1], nullptr, 0);
+               chunk.SetColumn(strtol(parts[1], nullptr, 0));
             }
             else if (strcasecmp(parts[0], "nl_count") == 0)
             {
-               chunk.nl_count = strtol(parts[1], nullptr, 0);
+               chunk.SetNlCount(strtol(parts[1], nullptr, 0));
             }
             else if (strcasecmp(parts[0], "text") == 0)
             {
-               if (chunk.type != CT_NEWLINE)
+               if (chunk.GetType() != CT_NEWLINE)
                {
-                  chunk.str = parts[1];
+                  chunk.Str() = parts[1];
                }
             }
             else
@@ -474,7 +474,7 @@ void dump_in(unsigned int type)
          }
       }
       // add the last chunk in the list
-      chunk_add_before(&chunk, nullptr);
+      chunk.CopyAndAddBefore(Chunk::NullChunkPtr);
       fclose(D_file);
    }
    else
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.h
index acd199b9..acd199b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.cpp
index ee5dac2b..523dd2c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.cpp
@@ -18,6 +18,7 @@
 #include "backup.h"
 #include "brace_cleanup.h"
 #include "braces.h"
+#include "change_int_types.h"
 #include "combine.h"
 #include "compat.h"
 #include "detect.h"
@@ -32,6 +33,7 @@
 #include "parent_for_pp.h"
 #include "remove_duplicate_include.h"
 #include "remove_extra_returns.h"
+#include "rewrite_infinite_loops.h"
 #include "semicolons.h"
 #include "sorting.h"
 #include "space.h"
@@ -173,7 +175,7 @@ static int load_mem_file_config(const std::string &filename, file_mem &fm);
 
 
 //! print uncrustify version number and terminate
-static void version_exit(void);
+static void version_exit();
 
 
 const char *path_basename(const char *path)
@@ -300,7 +302,8 @@ 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 tracking informations for debugging.\n"
+           " --tracking_space FILE : Prepare space tracking information for debugging.\n"
+           " --tracking_nl FILE    : Prepare newline tracking information for debugging.\n"
            "                         Cannot be used with the -o option'\n"
            "\n"
            "Usage Examples\n"
@@ -324,7 +327,7 @@ void usage(const char *argv0)
 } // usage
 
 
-static void version_exit(void)
+static void version_exit()
 {
    printf("%s\n", UNCRUSTIFY_VERSION);
    exit(EX_OK);
@@ -343,9 +346,8 @@ NODISCARD static int redir_stdout(const char *output_file)
       {
          LOG_FMT(LERR, "Unable to open %s for write: %s (%d)\n",
                  output_file, strerror(errno), errno);
-         cpd.error_count++;
          usage_error();
-         return(EX_IOERR);
+         exit(EX_IOERR);
       }
       LOG_FMT(LNOTE, "Redirecting output to %s\n", output_file);
    }
@@ -427,14 +429,14 @@ int main(int argc, char *argv[])
    // output.cpp, line 427: fprintf(pfile, "# Line              Tag                Parent...
    // and              430: ... fprintf(pfile, "%s# %3zu>%19.19s[%19.19s] ...
    // here                                                xx xx   xx xx
-   for (size_t token = 0; token < ARRAY_SIZE(token_names); token++)
+   for (const auto &token_name : token_names)
    {
-      const size_t name_length = strlen(token_names[token]);
+      const size_t name_length = strlen(token_name);
 
       if (name_length > max_name_length)
       {
          fprintf(stderr, "%s(%d): The token name '%s' is too long (%d)\n",
-                 __func__, __LINE__, token_names[token], static_cast<int>(name_length));
+                 __func__, __LINE__, token_name, static_cast<int>(name_length));
          fprintf(stderr, "%s(%d): the max token name length is %d\n",
                  __func__, __LINE__, max_name_length);
          log_flush(true);
@@ -443,7 +445,7 @@ int main(int argc, char *argv[])
    }
 
    // make sure we have token_names.h in sync with token_enum.h
-   assert(ARRAY_SIZE(token_names) == CT_TOKEN_COUNT_);
+   static_assert(ARRAY_SIZE(token_names) == CT_TOKEN_COUNT_, "");
 #endif // DEBUG
 
    Args arg(argc, argv);
@@ -507,7 +509,7 @@ int main(int argc, char *argv[])
 
       while ((p_arg = arg.Unused(idx)) != nullptr)
       {
-         log_pcf_flags(LSYS, static_cast<pcf_flag_e>(strtoul(p_arg, nullptr, 16)));
+         log_pcf_flags(LSYS, static_cast<E_PcfFlag>(strtoul(p_arg, nullptr, 16)));
       }
       return(EXIT_SUCCESS);
    }
@@ -658,17 +660,42 @@ int main(int argc, char *argv[])
    const char *output_file = arg.Param("-o");
 
    // for debugging tracking
-   cpd.html_file = arg.Param("--tracking_space");
+   const char *html_file = nullptr;
+   html_file = arg.Param("--tracking_space");
+
+   if (html_file != 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;
+
+      if (try_it)
+      {
+         usage_error("Cannot specify both --tracking_space and --tracking_nl.");
+         return(EX_NOUSER);
+      }
+   }
+   else
+   {
+      html_file = arg.Param("--tracking_nl");
+      bool try_it = html_file != nullptr;
 
+      if (try_it)
+      {
+         cpd.html_type = tracking_type_e::TT_NEWLINE;
+         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 != NULL) ? output_file : "null");
-   LOG_FMT(LDATA, "source_file = %s\n", (source_file != NULL) ? source_file : "null");
-   LOG_FMT(LDATA, "source_list = %s\n", (source_list != NULL) ? source_list : "null");
-   LOG_FMT(LDATA, "tracking    = %s\n", (cpd.html_file != NULL) ? cpd.html_file : "null");
-   LOG_FMT(LDATA, "prefix      = %s\n", (prefix != NULL) ? prefix : "null");
-   LOG_FMT(LDATA, "suffix      = %s\n", (suffix != NULL) ? suffix : "null");
-   LOG_FMT(LDATA, "assume      = %s\n", (assume != NULL) ? assume : "null");
+   LOG_FMT(LDATA, "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");
@@ -740,11 +767,11 @@ int main(int argc, char *argv[])
       if (options::nl_max() > 0)
       {
          // test if one/some option(s) is/are not too big for that
-         log_rule_B("nl_func_var_def_blk");
+         log_rule_B("nl_var_def_blk_end_func_top");
 
-         if (options::nl_func_var_def_blk() >= options::nl_max())
+         if (options::nl_var_def_blk_end_func_top() >= options::nl_max())
          {
-            fprintf(stderr, "The option 'nl_func_var_def_blk' is too big against the option 'nl_max'\n");
+            fprintf(stderr, "The option 'nl_var_def_blk_end_func_top' is too big against the option 'nl_max'\n");
             log_flush(true);
             exit(EX_CONFIG);
          }
@@ -860,8 +887,7 @@ int main(int argc, char *argv[])
       if (load_mem_file(source_file, fm) < 0)
       {
          LOG_FMT(LERR, "Failed to load (%s)\n", source_file);
-         cpd.error_count++;
-         return(EXIT_FAILURE);
+         exit(EX_IOERR);
       }
       uncrustify_start(fm.data);
       detect_options();
@@ -967,8 +993,7 @@ int main(int argc, char *argv[])
       if (!read_stdin(fm))
       {
          LOG_FMT(LERR, "Failed to read stdin\n");
-         cpd.error_count++;
-         return(100);
+         exit(EX_IOERR);
       }
       cpd.filename = "stdin";
 
@@ -1030,11 +1055,6 @@ int main(int argc, char *argv[])
    }
    clear_keyword_file();
 
-   if (cpd.error_count != 0)
-   {
-      return(EXIT_FAILURE);
-   }
-
    if (  cpd.do_check
       && cpd.check_fail_cnt != 0)
    {
@@ -1055,8 +1075,7 @@ static void process_source_list(const char *source_list,
    {
       LOG_FMT(LERR, "%s: fopen(%s) failed: %s (%d)\n",
               __func__, source_list, strerror(errno), errno);
-      cpd.error_count++;
-      return;
+      exit(EX_IOERR);
    }
    char linebuf[256];
    int  line = 0;
@@ -1172,8 +1191,7 @@ static void make_folders(const string &filename)
             {
                LOG_FMT(LERR, "%s: Unable to create %s: %s (%d)\n",
                        __func__, outname, strerror(errno), errno);
-               cpd.error_count++;
-               return;
+               exit(EX_IOERR);
             }
          }
          outname[idx] = PATH_SEP; // reconstruct full path to search for next subpath
@@ -1230,12 +1248,12 @@ static int load_mem_file(const char *filename, file_mem &fm)
       {
          LOG_FMT(LERR, "%s: fread(%s) failed: %s (%d)\n",
                  __func__, filename, strerror(errno), errno);
-         cpd.error_count++;
+         exit(EX_IOERR);
       }
       else if (!decode_unicode(fm.raw, fm.data, fm.enc, fm.bom))
       {
          LOG_FMT(LERR, "%s: failed to decode the file '%s'\n", __func__, filename);
-         cpd.error_count++;
+         exit(EX_IOERR);
       }
       else
       {
@@ -1271,7 +1289,7 @@ static int load_mem_file_config(const std::string &filename, file_mem &fm)
       if (retval < 0)
       {
          LOG_FMT(LERR, "Failed to load (%s) or (%s)\n", buf, filename.c_str());
-         cpd.error_count++;
+         exit(EX_IOERR);
       }
    }
    return(retval);
@@ -1500,8 +1518,7 @@ static void do_source_file(const char *filename_in,
    if (load_mem_file(filename_in, fm) < 0)
    {
       LOG_FMT(LERR, "Failed to load (%s)\n", filename_in);
-      cpd.error_count++;
-      return;
+      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));
@@ -1559,8 +1576,7 @@ static void do_source_file(const char *filename_in,
                {
                   LOG_FMT(LERR, "%s: Failed to create backup file for %s\n",
                           __func__, filename_in);
-                  cpd.error_count++;
-                  return;
+                  exit(EX_IOERR);
                }
                need_backup = true;
             }
@@ -1573,8 +1589,7 @@ static void do_source_file(const char *filename_in,
          {
             LOG_FMT(LERR, "%s: Unable to create %s: %s (%d)\n",
                     __func__, filename_tmp.c_str(), strerror(errno), errno);
-            cpd.error_count++;
-            return;
+            exit(EX_IOERR);
          }
          did_open = true;
          //LOG_FMT(LSYS, "Output file %s\n", filename_out);
@@ -1583,9 +1598,9 @@ static void do_source_file(const char *filename_in,
 
    if (cpd.if_changed)
    {
-      for (deque<UINT8>::const_iterator i = cpd.bout->begin(), end = cpd.bout->end(); i != end; ++i)
+      for (UINT8 i : *cpd.bout)
       {
-         fputc(*i, pfout);
+         fputc(i, pfout);
       }
 
       uncrustify_end();
@@ -1629,7 +1644,7 @@ static void do_source_file(const char *filename_in,
             {
                LOG_FMT(LERR, "%s: Unable to rename '%s' to '%s'\n",
                        __func__, filename_tmp.c_str(), filename_out);
-               cpd.error_count++;
+               exit(EX_IOERR);
             }
          }
       }
@@ -1664,18 +1679,18 @@ static void add_file_footer()
 
    // Back up if the file ends with a newline
    if (  pc->IsNotNullChunk()
-      && chunk_is_newline(pc))
+      && pc->IsNewline())
    {
       pc = pc->GetPrev();
    }
 
    if (  pc->IsNotNullChunk()
       && (  !pc->IsComment()
-         || !chunk_is_newline(pc->GetPrev())))
+         || !pc->GetPrev()->IsNewline()))
    {
       pc = Chunk::GetTail();
 
-      if (!chunk_is_newline(pc))
+      if (!pc->IsNewline())
       {
          LOG_FMT(LSYS, "Adding a newline at the end of the file\n");
          newline_add_after(pc);
@@ -1694,13 +1709,13 @@ static void add_func_header(E_Token type, file_mem &fm)
 
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnlNpp())
    {
-      if (pc->type != type)
+      if (pc->GetType() != type)
       {
          continue;
       }
       log_rule_B("cmt_insert_before_inlines");
 
-      if (  pc->flags.test(PCF_IN_CLASS)
+      if (  pc->TestFlags(PCF_IN_CLASS)
          && !options::cmt_insert_before_inlines())
       {
          continue;
@@ -1708,20 +1723,20 @@ static void add_func_header(E_Token type, file_mem &fm)
       // Check for one liners for classes. Declarations only. Walk down the chunks.
       ref = pc;
 
-      if (  chunk_is_token(ref, CT_CLASS)
-         && get_chunk_parent_type(ref) == CT_NONE
+      if (  ref->Is(CT_CLASS)
+         && ref->GetParentType() == CT_NONE
          && ref->GetNext())
       {
          ref = ref->GetNext();
 
-         if (  chunk_is_token(ref, CT_TYPE)
-            && get_chunk_parent_type(ref) == type
+         if (  ref->Is(CT_TYPE)
+            && ref->GetParentType() == type
             && ref->GetNext())
          {
             ref = ref->GetNext();
 
-            if (  chunk_is_token(ref, CT_SEMICOLON)
-               && ref->level == pc->level)
+            if (  ref->Is(CT_SEMICOLON)
+               && ref->GetLevel() == pc->GetLevel())
             {
                continue;
             }
@@ -1730,16 +1745,16 @@ static void add_func_header(E_Token type, file_mem &fm)
       // Check for one liners for functions. There'll be a closing brace w/o any newlines. Walk down the chunks.
       ref = pc;
 
-      if (  chunk_is_token(ref, CT_FUNC_DEF)
-         && get_chunk_parent_type(ref) == CT_NONE
+      if (  ref->Is(CT_FUNC_DEF)
+         && ref->GetParentType() == CT_NONE
          && ref->GetNext())
       {
          int found_brace = 0;                                 // Set if a close brace is found before a newline
 
-         while (  ref->type != CT_NEWLINE
+         while (  ref->IsNot(CT_NEWLINE)
                && (ref = ref->GetNext())) // TODO: is the assignment of ref wanted here?, better move it to the loop
          {
-            if (chunk_is_token(ref, CT_BRACE_CLOSE))
+            if (ref->Is(CT_BRACE_CLOSE))
             {
                found_brace = 1;
                break;
@@ -1763,27 +1778,27 @@ static void add_func_header(E_Token type, file_mem &fm)
             && ref->IsNotNullChunk())
       {
          // Bail if we change level or find an access specifier colon
-         if (  ref->level != pc->level
-            || chunk_is_token(ref, CT_ACCESS_COLON))
+         if (  ref->GetLevel() != pc->GetLevel()
+            || ref->Is(CT_ACCESS_COLON))
          {
             do_insert = true;
             break;
          }
 
          // If we hit an angle close, back up to the angle open
-         if (chunk_is_token(ref, CT_ANGLE_CLOSE))
+         if (ref->Is(CT_ANGLE_CLOSE))
          {
-            ref = ref->GetPrevType(CT_ANGLE_OPEN, ref->level, E_Scope::PREPROC);
+            ref = ref->GetPrevType(CT_ANGLE_OPEN, ref->GetLevel(), E_Scope::PREPROC);
             continue;
          }
 
          // Bail if we hit a preprocessor and cmt_insert_before_preproc is false
-         if (ref->flags.test(PCF_IN_PREPROC))
+         if (ref->TestFlags(PCF_IN_PREPROC))
          {
-            tmp = ref->GetPrevType(CT_PREPROC, ref->level);
+            tmp = ref->GetPrevType(CT_PREPROC, ref->GetLevel());
 
             if (  tmp->IsNotNullChunk()
-               && get_chunk_parent_type(tmp) == CT_PP_IF)
+               && tmp->GetParentType() == CT_PP_IF)
             {
                tmp = tmp->GetPrevNnl();
 
@@ -1799,15 +1814,15 @@ static void add_func_header(E_Token type, file_mem &fm)
 
          // Ignore 'right' comments
          if (  ref->IsComment()
-            && chunk_is_newline(ref->GetPrev()))
+            && ref->GetPrev()->IsNewline())
          {
             break;
          }
 
-         if (  ref->level == pc->level
-            && (  ref->flags.test(PCF_IN_PREPROC)
-               || chunk_is_token(ref, CT_SEMICOLON)
-               || chunk_is_token(ref, CT_BRACE_CLOSE)))
+         if (  ref->GetLevel() == pc->GetLevel()
+            && (  ref->TestFlags(PCF_IN_PREPROC)
+               || ref->Is(CT_SEMICOLON)
+               || ref->Is(CT_BRACE_CLOSE)))
          {
             do_insert = true;
             break;
@@ -1816,7 +1831,7 @@ static void add_func_header(E_Token type, file_mem &fm)
 
       if (  ref->IsNullChunk()
          && !Chunk::GetHead()->IsComment()
-         && get_chunk_parent_type(Chunk::GetHead()) == type)
+         && Chunk::GetHead()->GetParentType() == type)
       {
          /**
           * In addition to testing for preceding semicolons, closing braces, etc.,
@@ -1833,7 +1848,7 @@ static void add_func_header(E_Token type, file_mem &fm)
 
          for (tmp = ref->GetNext(); tmp != after; tmp = tmp->GetNext())
          {
-            tmp->level = after->level;
+            tmp->SetLevel(after->GetLevel());
          }
       }
    }
@@ -1849,7 +1864,7 @@ static void add_msg_header(E_Token type, file_mem &fm)
 
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnlNpp())
    {
-      if (pc->type != type)
+      if (pc->GetType() != type)
       {
          continue;
       }
@@ -1861,31 +1876,30 @@ static void add_msg_header(E_Token type, file_mem &fm)
        */
       ref = pc;
 
-      while (  (ref = ref->GetPrev()) != nullptr
-            && ref->IsNotNullChunk())
+      while ((ref = ref->GetPrev())->IsNotNullChunk())
       {
          // ignore the CT_TYPE token that is the result type
-         if (  ref->level != pc->level
-            && (  chunk_is_token(ref, CT_TYPE)
-               || chunk_is_token(ref, CT_PTR_TYPE)))
+         if (  ref->GetLevel() != pc->GetLevel()
+            && (  ref->Is(CT_TYPE)
+               || ref->Is(CT_PTR_TYPE)))
          {
             continue;
          }
 
          // If we hit a parentheses around return type, back up to the open parentheses
-         if (chunk_is_token(ref, CT_PAREN_CLOSE))
+         if (ref->Is(CT_PAREN_CLOSE))
          {
-            ref = ref->GetPrevType(CT_PAREN_OPEN, ref->level, E_Scope::PREPROC);
+            ref = ref->GetPrevType(CT_PAREN_OPEN, ref->GetLevel(), E_Scope::PREPROC);
             continue;
          }
 
          // Bail if we hit a preprocessor and cmt_insert_before_preproc is false
-         if (ref->flags.test(PCF_IN_PREPROC))
+         if (ref->TestFlags(PCF_IN_PREPROC))
          {
-            tmp = ref->GetPrevType(CT_PREPROC, ref->level);
+            tmp = ref->GetPrevType(CT_PREPROC, ref->GetLevel());
 
             if (  tmp->IsNotNullChunk()
-               && get_chunk_parent_type(tmp) == CT_PP_IF)
+               && tmp->GetParentType() == CT_PP_IF)
             {
                tmp = tmp->GetPrevNnl();
 
@@ -1899,16 +1913,16 @@ static void add_msg_header(E_Token type, file_mem &fm)
             }
          }
 
-         if (  ref->level == pc->level
-            && (  ref->flags.test(PCF_IN_PREPROC)
-               || chunk_is_token(ref, CT_OC_SCOPE)))
+         if (  ref->GetLevel() == pc->GetLevel()
+            && (  ref->TestFlags(PCF_IN_PREPROC)
+               || ref->Is(CT_OC_SCOPE)))
          {
             ref = ref->GetPrev();
 
             if (ref->IsNotNullChunk())
             {
                // Ignore 'right' comments
-               if (  chunk_is_newline(ref)
+               if (  ref->IsNewline()
                   && ref->GetPrev()->IsComment())
                {
                   break;
@@ -1927,7 +1941,7 @@ static void add_msg_header(E_Token type, file_mem &fm)
 
          for (tmp = ref->GetNext(); tmp != after; tmp = tmp->GetNext())
          {
-            tmp->level = after->level;
+            tmp->SetLevel(after->GetLevel());
          }
       }
    }
@@ -1947,7 +1961,7 @@ static void uncrustify_start(const deque<int> &data)
    {
       Chunk *pc = Chunk::GetHead();
 
-      cpd.frag_cols = pc->orig_col;
+      cpd.frag_cols = pc->GetOrigCol();
    }
 
    // Add the file header
@@ -1983,8 +1997,11 @@ static void uncrustify_start(const deque<int> &data)
    {
       pawn_prescan();
    }
+   mark_question_colon();
+
    // Re-type chunks, combine chunks
    fix_symbols();
+
    tokenize_trailing_return_types();
 
    mark_comments();
@@ -2053,8 +2070,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
                  cpd.filename.c_str(), count_line, count_column);
          LOG_FMT(LERR, "The file may be encoded in an unsupported Unicode format.\n");
          LOG_FMT(LERR, "Aborting.\n");
-         cpd.error_count++;
-         return;
+         exit(EX_IOERR);
       }
       count_column++;
 
@@ -2098,6 +2114,14 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
          add_msg_header(CT_OC_MSG_DECL, cpd.oc_msg_hdr);
       }
       do_parent_for_pp();
+
+      // Rewrite infinite loops
+      log_rule_B("mod_infinite_loop");
+
+      if (options::mod_infinite_loop())
+      {
+         rewrite_infinite_loops();
+      }
       do_braces();  // Change virtual braces into real braces...
 
       // Scrub extra semicolons
@@ -2114,8 +2138,31 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
       {
          remove_extra_returns();
       }
+      // Add or remove redundant 'int' keyword of integer types
+      log_rule_B("mod_int_short");
+      log_rule_B("mod_short_int");
+      log_rule_B("mod_int_long");
+      log_rule_B("mod_long_int");
+      log_rule_B("mod_int_signed");
+      log_rule_B("mod_signed_int");
+      log_rule_B("mod_int_unsigned");
+      log_rule_B("mod_unsigned_int");
+
+      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
-      log_rule_B("mod_duplicate_include");
+      log_rule_B("mod_remove_duplicate_include");
 
       if (options::mod_remove_duplicate_include())
       {
@@ -2227,7 +2274,9 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
          {
             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();
@@ -2413,7 +2462,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
       {
          LOG_FMT(LERR, "%s: Failed to open '%s' for write: %s (%d)\n",
                  __func__, parsed_file, strerror(errno), errno);
-         cpd.error_count++;
+         exit(EX_IOERR);
       }
    }
 
@@ -2439,7 +2488,7 @@ void uncrustify_end()
 
    while ((pc = Chunk::GetHead())->IsNotNullChunk())
    {
-      chunk_del(pc);
+      Chunk::Delete(pc);
    }
 
    if (cpd.bout)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.h
index 1f85b993..0a584805 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.h
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-int load_header_files(void);
+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);
@@ -42,11 +42,6 @@ const char *language_name_from_flags(size_t lang);
  */
 E_Token find_token_name(const char *text);
 
-std::string pcf_flags_str(pcf_flags_t flags);
-
-
-void log_pcf_flags(log_sev_t sev, pcf_flags_t flags);
-
 
 /**
  * Replace the brain-dead and non-portable basename().
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_emscripten.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_emscripten.cpp
index a336fea4..72206627 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_emscripten.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_emscripten.cpp
@@ -486,10 +486,9 @@ intptr_t _uncrustify(intptr_t _file, lang_flag_e langIDX, bool frag, bool defer)
 {
    // Problem: uncrustify originally is not a lib and uses global vars such as
    // cpd.error_count for the whole program execution
-   // to know if errors occurred during the formating step we reset this var here
-   cpd.error_count = 0;
-   cpd.filename    = "stdin";
-   cpd.frag        = frag;
+   // to know if errors occurred during the formatting step we reset this var here
+   cpd.filename = "stdin";
+   cpd.frag     = frag;
 
    if (langIDX == 0)   // 0 == undefined
    {
@@ -545,7 +544,7 @@ intptr_t _uncrustify(intptr_t _file, lang_flag_e langIDX, bool frag, bool defer)
       return(0);
    }
    // TODO One way to implement the --parsed, -p functionality would
-   // be to let the uncrustify_file function run, throw away the formated
+   // be to let the uncrustify_file function run, throw away the formatted
    // output and return the debug as a string. For this uncrustify_file would
    // need to accept a stream, FILE or a char array pointer in which the output
    // will be stored.
@@ -563,11 +562,6 @@ intptr_t _uncrustify(intptr_t _file, lang_flag_e langIDX, bool frag, bool defer)
    fflush(stream);
    fclose(stream);
 
-   if (cpd.error_count != 0)
-   {
-      LOG_FMT(LWARN, "%d errors occurred during formating\n", cpd.error_count);
-   }
-
    if (len == 0)
    {
       return(0);
@@ -620,7 +614,7 @@ intptr_t _debug(intptr_t _file, lang_flag_e langIDX, bool frag)
    auto formatted_str_ptr = _uncrustify(_file, langIDX, frag, true);
    char *formatted_str    = reinterpret_cast<char *>(formatted_str_ptr);
 
-   // Lazy solution: Throw away the formated file output.
+   // Lazy solution: Throw away the formatted file output.
    // Maybe later add option to return both formatted file string and debug
    // file string together ... somehow.
    free(formatted_str);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_limits.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_limits.h
index 9f226870..9f226870 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_limits.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_limits.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.cpp
index bd57f2d5..bd57f2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.h
index b0bdae8d..402c7922 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.h
@@ -39,25 +39,13 @@ class ParseFrame;
 #define UNCRUSTIFY_OFF_TEXT    " *INDENT-OFF*"
 #define UNCRUSTIFY_ON_TEXT     " *INDENT-ON*"
 
-//! returns type (with removed reference) of a variable
-#define noref_decl_t(X)              std::remove_reference<decltype((X))>::type
-
-//! returns type (with removed const and reference) of a variable
-#define nocref_decl_t(X)             std::remove_const<noref_decl_t((X))>::type
-
-//! static casts Y to the type (with removed reference) of X
-#define s_cast_noref_decl_t(X, Y)    static_cast<nocref_decl_t(X)>(Y)
-
-//! performs abs on Y after static casting it to the type (with removed reference) of X
-#define cast_abs(X, Y)               s_cast_noref_decl_t(X, abs(Y))
-
 /**
  * @brief Macro to inform the compiler that a variable is intentionally
  * not in use.
  *
  * @param [in] variableName: The unused variable.
  */
-#define UNUSED(variableName)         ((void)variableName)
+#define UNUSED(variableName)    ((void)variableName)
 
 
 //! Brace stage enum used in brace_cleanup
@@ -87,6 +75,13 @@ enum class char_encoding_e : unsigned int
    e_UTF16_BE   //! utf 16 bit wide, big endian
 };
 
+enum class tracking_type_e : unsigned int
+{
+   TT_NONE,
+   TT_SPACE,
+   TT_NEWLINE
+};
+
 
 class Chunk; //forward declaration
 
@@ -96,14 +91,14 @@ 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 indent_ptr_t
+struct T_IndentData
 {
    Chunk *ref;
    int   delta;
 };
 
 
-struct align_ptr_t
+struct T_AlignData
 {
    Chunk  *next;       //! nullptr or the chunk that should be under this one
    bool   right_align; //! AlignStack.m_right_align
@@ -184,6 +179,7 @@ struct align_t
    size_t  col;
    E_Token type;
    size_t  len;      //! length of the token + space
+   Chunk   *ref;     // Issue #3786
 };
 
 //! holds information and data of a file
@@ -221,7 +217,6 @@ struct cp_data_t
    int               check_fail_cnt;       //! total failure count
    bool              if_changed;
 
-   UINT32            error_count;       //! counts how many errors occurred so far
    std::string       filename;
 
    file_mem          file_hdr;          // for cmt_insert_file_header
@@ -249,7 +244,7 @@ struct cp_data_t
    UINT32            le_counts[uncrustify::line_end_styles];
    unc_text          newline;
 
-   int               did_newline;       //! flag indicates if a newline was added or converted
+   bool              did_newline;       //! flag indicates if a newline was added or converted
    E_Token           in_preproc;
    int               preproc_ncnl_count;
    bool              output_trailspace;
@@ -272,7 +267,9 @@ struct cp_data_t
 
    const char        *phase_name;
    const char        *dumped_file;
-   const char        *html_file = nullptr; // for debugging purpose only
+   // for debugging purpose only
+   tracking_type_e   html_type  = tracking_type_e::TT_NONE;
+   const char        *html_file = nullptr;
 };
 
 extern cp_data_t cpd;  // TODO: can we avoid this external variable?
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_version.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_version.h.in
index 079e0fa6..079e0fa6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_version.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_version.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.cpp
index 172cda28..0acd4ddb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.cpp
@@ -512,7 +512,7 @@ static void write_utf16(int ch, bool be)
 } // write_utf16
 
 
-void write_bom(void)
+void write_bom()
 {
    switch (cpd.enc)
    {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.h
index e9cbd97c..7217778b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.h
@@ -12,7 +12,7 @@
 #include "uncrustify_types.h"
 
 
-void write_bom(void);
+void write_bom();
 
 
 /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.cpp
index eff612be..12c66b5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.cpp
@@ -61,7 +61,7 @@ void print_universal_indent_cfg(FILE *pfile)
 #if defined (DEBUG) && !defined (WIN32)
    vector<size_t> allGroups;
    allGroups.reserve(16);
-   // first run to get the first option number of each group/categorie
+   // first run to get the first option number of each group/category
    size_t optionNumber         = 0;
    bool   firstOptionNumberSet = false;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.h
index 35a65167..35a65167 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.cpp
index a3dbeab4..7734c90e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.cpp
@@ -82,7 +82,7 @@ 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 == brace_level:
+ * 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
@@ -129,10 +129,10 @@ 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->orig_line, pc->orig_col, pc->Text());
+   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->column + pc->Len() - 1) > options::code_width());
+   return((pc->GetColumn() + pc->Len() - 1) > options::code_width());
 }
 
 
@@ -141,34 +141,33 @@ static void split_before_chunk(Chunk *pc)
    LOG_FUNC_ENTRY();
    LOG_FMT(LSPLIT, "%s(%d): Text() '%s'\n", __func__, __LINE__, pc->Text());
 
-   if (  !chunk_is_newline(pc)
-      && !chunk_is_newline(pc->GetPrev()))
+   if (  !pc->IsNewline()
+      && !pc->GetPrev()->IsNewline())
    {
       newline_add_before(pc);
       // reindent needs to include the indent_continue value and was off by one
       log_rule_B("indent_columns");
       log_rule_B("indent_continue");
-      reindent_line(pc, pc->brace_level * options::indent_columns() +
+      reindent_line(pc, pc->GetBraceLevel() * options::indent_columns() +
                     abs(options::indent_continue()) + 1);
       cpd.changes++;
    }
 }
 
 
-void do_code_width(void)
+void do_code_width()
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LSPLIT, "%s(%d)\n", __func__, __LINE__);
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (  !chunk_is_newline(pc)
-         && !pc->IsComment()
-         && chunk_is_not_token(pc, CT_SPACE)
+      if (  !pc->IsCommentOrNewline()
+         && pc->IsNot(CT_SPACE)
          && is_past_width(pc))
       {
-         if (  chunk_is_token(pc, CT_VBRACE_CLOSE) // don't break if a vbrace close
-            && chunk_is_last_on_line(pc))          // is the last chunk on its line
+         if (  pc->Is(CT_VBRACE_CLOSE)  // don't break if a vbrace close
+            && pc->IsLastChunkOnLine()) // is the last chunk on its line
          {
             continue;
          }
@@ -176,13 +175,13 @@ void do_code_width(void)
 
          if (split_OK)
          {
-            LOG_FMT(LSPLIT, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+            LOG_FMT(LSPLIT, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
          }
          else
          {
-            LOG_FMT(LSPLIT, "%s(%d): Bailed! orig_line is %zu, orig_col is %zu, Text() '%s'\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+            LOG_FMT(LSPLIT, "%s(%d): Bailed! orig line is %zu, orig col is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
             break;
          }
       }
@@ -234,8 +233,8 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LSPLIT, "%s(%d): at %s, orig_col=%zu\n", __func__, __LINE__, pc->Text(), pc->orig_col);
-   size_t pc_pri = get_split_pri(pc->type);
+   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);
 
@@ -248,25 +247,25 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
    // Can't split after a newline
    Chunk *prev = pc->GetPrev();
 
-   if (  prev == nullptr
-      || (  chunk_is_newline(prev)
-         && chunk_is_not_token(pc, CT_STRING)))
+   if (  prev->IsNullChunk()
+      || (  prev->IsNewline()
+         && pc->IsNot(CT_STRING)))
    {
-      if (prev != nullptr)
+      if (prev->IsNotNullChunk())
       {
-         LOG_FMT(LSPLIT, "%s(%d): Can't split after a newline, orig_line is %zu, return\n",
-                 __func__, __LINE__, prev->orig_line);
+         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 (chunk_is_token(pc, CT_FPAREN_OPEN))
+   if (pc->Is(CT_FPAREN_OPEN))
    {
       Chunk *next = pc->GetNext();
 
-      if (chunk_is_token(next, CT_FPAREN_CLOSE))
+      if (next->Is(CT_FPAREN_CLOSE))
       {
          LOG_FMT(LSPLIT, "%s(%d): Can't split a function without arguments, return\n", __func__, __LINE__);
          return;
@@ -275,11 +274,11 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
    LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
 
    // Only split concatenated strings
-   if (chunk_is_token(pc, CT_STRING))
+   if (pc->Is(CT_STRING))
    {
       Chunk *next = pc->GetNext();
 
-      if (chunk_is_not_token(next, CT_STRING))
+      if (next->IsNot(CT_STRING))
       {
          LOG_FMT(LSPLIT, "%s(%d): Only split concatenated strings, return\n", __func__, __LINE__);
          return;
@@ -303,8 +302,8 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
    {
       Chunk *next = pc->GetNext();
 
-      if (  chunk_is_not_token(next, CT_WORD)
-         && (get_split_pri(next->type) != 25))
+      if (  next->IsNot(CT_WORD)
+         && (get_split_pri(next->GetType()) != 25))
       {
          LOG_FMT(LSPLIT, "%s(%d): don't break after last term of a qualified type, return\n", __func__, __LINE__);
          return;
@@ -315,7 +314,7 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
    bool change = false;
 
    if (  ent.pc == nullptr
-      || pc->level < ent.pc->level)
+      || pc->GetLevel() < ent.pc->GetLevel())
    {
       LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
       change = true;
@@ -342,18 +341,18 @@ 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",
-           __func__, __LINE__, start->Text(), start->orig_line, start->orig_col, get_token_name(start->type));
-   LOG_FMT(LSPLIT, "   start->flags ");
-   log_pcf_flags(LSPLIT, start->flags);
-   LOG_FMT(LSPLIT, "   start->parent_type %s, (PCF_IN_FCN_DEF is %s), (PCF_IN_FCN_CALL is %s)\n",
-           get_token_name(get_chunk_parent_type(start)),
-           start->flags.test((PCF_IN_FCN_DEF)) ? "TRUE" : "FALSE",
-           start->flags.test((PCF_IN_FCN_CALL)) ? "TRUE" : "FALSE");
+   LOG_FMT(LSPLIT, "%s(%d): start->Text() '%s', orig line is %zu, orig col is %zu, type is %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",
+           get_token_name(start->GetParentType()),
+           start->TestFlags((PCF_IN_FCN_DEF)) ? "TRUE" : "FALSE",
+           start->TestFlags((PCF_IN_FCN_CALL)) ? "TRUE" : "FALSE");
 
    // break at maximum line length if ls_code_width is true
    // Issue #2432
-   if (start->flags.test(PCF_ONE_LINER))
+   if (start->TestFlags(PCF_ONE_LINER))
    {
       LOG_FMT(LSPLIT, "%s(%d): ** ONCE LINER SPLIT **\n", __func__, __LINE__);
       undo_one_liner(start);
@@ -370,7 +369,7 @@ static bool split_line(Chunk *start)
    {
    }
    // Check to see if we are in a for statement
-   else if (start->flags.test(PCF_IN_FOR))
+   else if (start->TestFlags(PCF_IN_FOR))
    {
       LOG_FMT(LSPLIT, " ** FOR SPLIT **\n");
       split_for_stmt(start);
@@ -386,10 +385,10 @@ static bool split_line(Chunk *start)
     * If this is in a function call or prototype, split on commas or right
     * after the open parenthesis
     */
-   else if (  start->flags.test(PCF_IN_FCN_DEF)
-           || get_chunk_parent_type(start) == CT_FUNC_PROTO            // Issue #1169
-           || (  (start->level == (start->brace_level + 1))
-              && start->flags.test(PCF_IN_FCN_CALL)))
+   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)))
    {
       LOG_FMT(LSPLIT, " ** FUNC SPLIT **\n");
 
@@ -411,7 +410,7 @@ static bool split_line(Chunk *start)
    /*
     * If this is in a template, split on commas, Issue #1170
     */
-   else if (start->flags.test(PCF_IN_TEMPLATE))
+   else if (start->TestFlags(PCF_IN_TEMPLATE))
    {
       LOG_FMT(LSPLIT, " ** TEMPLATE SPLIT **\n");
       split_template(start);
@@ -427,12 +426,12 @@ static bool split_line(Chunk *start)
 
    while (  ((pc = pc->GetPrev()) != nullptr)
          && pc->IsNotNullChunk()
-         && !chunk_is_newline(pc))
+         && !pc->IsNewline())
    {
-      LOG_FMT(LSPLIT, "%s(%d): at %s, orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
+      LOG_FMT(LSPLIT, "%s(%d): at %s, orig line is %zu, orig col is %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
 
-      if (chunk_is_not_token(pc, CT_SPACE))
+      if (pc->IsNot(CT_SPACE))
       {
          try_split_here(ent, pc);
 
@@ -449,15 +448,15 @@ static bool split_line(Chunk *start)
 
    if (ent.pc == nullptr)
    {
-      LOG_FMT(LSPLIT, "%s(%d):    TRY_SPLIT yielded NO SOLUTION for orig_line %zu at '%s' [%s]\n",
-              __func__, __LINE__, start->orig_line, start->Text(), get_token_name(start->type));
+      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()));
    }
    else
    {
-      LOG_FMT(LSPLIT, "%s(%d):    TRY_SPLIT yielded '%s' [%s] on orig_line %zu\n",
-              __func__, __LINE__, ent.pc->Text(), get_token_name(ent.pc->type), ent.pc->orig_line);
-      LOG_FMT(LSPLIT, "%s(%d): ent at '%s', orig_col is %zu\n",
-              __func__, __LINE__, ent.pc->Text(), ent.pc->orig_col);
+      LOG_FMT(LSPLIT, "%s(%d):    TRY_SPLIT yielded '%s' [%s] on orig line %zu\n",
+              __func__, __LINE__, ent.pc->Text(), get_token_name(ent.pc->GetType()), ent.pc->GetOrigLine());
+      LOG_FMT(LSPLIT, "%s(%d): ent at '%s', orig col is %zu\n",
+              __func__, __LINE__, ent.pc->Text(), ent.pc->GetOrigCol());
    }
 
    // Break before the token instead of after it according to the pos_xxx rules
@@ -474,19 +473,19 @@ static bool split_line(Chunk *start)
       log_rule_B("pos_shift");
       log_rule_B("pos_bool");
 
-      if (  (  chunk_is_token(ent.pc, CT_SHIFT)
+      if (  (  ent.pc->Is(CT_SHIFT)
             && (options::pos_shift() & TP_LEAD))
-         || (  (  chunk_is_token(ent.pc, CT_ARITH)
-               || chunk_is_token(ent.pc, CT_CARET))
+         || (  (  ent.pc->Is(CT_ARITH)
+               || ent.pc->Is(CT_CARET))
             && (options::pos_arith() & TP_LEAD))
-         || (  chunk_is_token(ent.pc, CT_ASSIGN)
+         || (  ent.pc->Is(CT_ASSIGN)
             && (options::pos_assign() & TP_LEAD))
-         || (  chunk_is_token(ent.pc, CT_COMPARE)
+         || (  ent.pc->Is(CT_COMPARE)
             && (options::pos_compare() & TP_LEAD))
-         || (  (  chunk_is_token(ent.pc, CT_COND_COLON)
-               || chunk_is_token(ent.pc, CT_QUESTION))
+         || (  (  ent.pc->Is(CT_COND_COLON)
+               || ent.pc->Is(CT_QUESTION))
             && (options::pos_conditional() & TP_LEAD))
-         || (  chunk_is_token(ent.pc, CT_BOOL)
+         || (  ent.pc->Is(CT_BOOL)
             && (options::pos_bool() & TP_LEAD)))
       {
          pc = ent.pc;
@@ -495,8 +494,8 @@ static bool split_line(Chunk *start)
       {
          pc = ent.pc->GetNext();
       }
-      LOG_FMT(LSPLIT, "%s(%d): at '%s', orig_col is %zu\n",
-              __func__, __LINE__, pc->Text(), pc->orig_col);
+      LOG_FMT(LSPLIT, "%s(%d): at '%s', orig col is %zu\n",
+              __func__, __LINE__, pc->Text(), pc->GetOrigCol());
    }
 
    if (  pc == nullptr
@@ -505,17 +504,16 @@ static bool split_line(Chunk *start)
       pc = start;
 
       // Don't break before a close, comma, or colon
-      if (  chunk_is_token(start, CT_PAREN_CLOSE)
-         || chunk_is_token(start, CT_PAREN_OPEN)
-         || chunk_is_token(start, CT_FPAREN_CLOSE)
-         || chunk_is_token(start, CT_FPAREN_OPEN)
-         || chunk_is_token(start, CT_SPAREN_CLOSE)
-         || chunk_is_token(start, CT_SPAREN_OPEN)
-         || chunk_is_token(start, CT_ANGLE_CLOSE)
-         || chunk_is_token(start, CT_BRACE_CLOSE)
-         || chunk_is_token(start, CT_COMMA)
-         || chunk_is_token(start, CT_SEMICOLON)
-         || chunk_is_token(start, CT_VSEMICOLON)
+      if (  start->Is(CT_PAREN_CLOSE)
+         || start->Is(CT_PAREN_OPEN)
+         || start->Is(CT_FPAREN_CLOSE)
+         || start->Is(CT_FPAREN_OPEN)
+         || start->Is(CT_SPAREN_CLOSE)
+         || start->Is(CT_SPAREN_OPEN)
+         || start->Is(CT_ANGLE_CLOSE)
+         || start->Is(CT_BRACE_CLOSE)
+         || start->Is(CT_COMMA)
+         || start->IsSemicolon()
          || start->Len() == 0)
       {
          LOG_FMT(LSPLIT, " ** NO GO **\n");
@@ -527,19 +525,18 @@ static bool split_line(Chunk *start)
    // add a newline before pc
    prev = pc->GetPrev();
 
-   if (  prev != nullptr
-      && prev->IsNotNullChunk()
-      && !chunk_is_newline(pc)
-      && !chunk_is_newline(prev))
+   if (  prev->IsNotNullChunk()
+      && !pc->IsNewline()
+      && !prev->IsNewline())
    {
       //int plen = (pc->Len() < 5) ? pc->Len() : 5;
       //int slen = (start->Len() < 5) ? start->Len() : 5;
       //LOG_FMT(LSPLIT, " '%.*s' [%s], started on token '%.*s' [%s]\n",
-      //        plen, pc->Text(), get_token_name(pc->type),
-      //        slen, start->Text(), get_token_name(start->type));
+      //        plen, pc->Text(), get_token_name(pc->GetType()),
+      //        slen, start->Text(), get_token_name(start->GetType()));
       LOG_FMT(LSPLIT, "%s(%d): Text() '%s', type %s, started on token '%s', type %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type),
-              start->Text(), get_token_name(start->type));
+              __func__, __LINE__, pc->Text(), get_token_name(pc->GetType()),
+              start->Text(), get_token_name(start->GetType()));
 
       split_before_chunk(pc);
    }
@@ -565,23 +562,22 @@ static void split_for_stmt(Chunk *start)
    size_t nl_cnt      = 0;
 
    LOG_FMT(LSPLIT, "%s: starting on %s, line %zu\n",
-           __func__, start->Text(), start->orig_line);
+           __func__, start->Text(), start->GetOrigLine());
 
    // Find the open paren so we know the level and count newlines
    Chunk *pc = start;
 
-   while (  ((pc = pc->GetPrev()) != nullptr)
-         && pc->IsNotNullChunk())
+   while ((pc = pc->GetPrev())->IsNotNullChunk())
    {
-      if (chunk_is_token(pc, CT_SPAREN_OPEN))
+      if (pc->Is(CT_SPAREN_OPEN))
       {
          open_paren = pc;
          break;
       }
 
-      if (pc->nl_count > 0)
+      if (pc->GetNlCount() > 0)
       {
-         nl_cnt += pc->nl_count;
+         nl_cnt += pc->GetNlCount();
       }
    }
 
@@ -596,20 +592,20 @@ static void split_for_stmt(Chunk *start)
 
    pc = start;
 
-   if (  chunk_is_token(pc, CT_SEMICOLON)
-      && get_chunk_parent_type(pc) == CT_FOR)
+   if (  pc->Is(CT_SEMICOLON)
+      && pc->GetParentType() == CT_FOR)
    {
       st[count++] = pc;
    }
 
    // first scan backwards for the semicolons
    while (  (count < static_cast<int>(max_cnt))
-         && ((pc = pc->GetPrev()) != nullptr)
+         && ((pc = pc->GetPrev())->IsNotNullChunk())
          && pc->IsNotNullChunk()
-         && pc->flags.test(PCF_IN_SPAREN))
+         && pc->TestFlags(PCF_IN_SPAREN))
    {
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && get_chunk_parent_type(pc) == CT_FOR)
+      if (  pc->Is(CT_SEMICOLON)
+         && pc->GetParentType() == CT_FOR)
       {
          st[count++] = pc;
       }
@@ -619,10 +615,10 @@ static void split_for_stmt(Chunk *start)
 
    while (  (count < static_cast<int>(max_cnt))
          && ((pc = pc->GetNext())->IsNotNullChunk())
-         && pc->flags.test(PCF_IN_SPAREN))
+         && pc->TestFlags(PCF_IN_SPAREN))
    {
-      if (  chunk_is_token(pc, CT_SEMICOLON)
-         && get_chunk_parent_type(pc) == CT_FOR)
+      if (  pc->Is(CT_SEMICOLON)
+         && pc->GetParentType() == CT_FOR)
       {
          st[count++] = pc;
       }
@@ -640,13 +636,13 @@ static void split_for_stmt(Chunk *start)
    {
       return;
    }
-   // Still past width, check for commas at parenthese level
+   // Still past width, check for commas at parentheses level
    pc = open_paren;
 
    while ((pc = pc->GetNext()) != start)
    {
-      if (  chunk_is_token(pc, CT_COMMA)
-         && (pc->level == (open_paren->level + 1)))
+      if (  pc->Is(CT_COMMA)
+         && (pc->GetLevel() == (open_paren->GetLevel() + 1)))
       {
          split_before_chunk(pc->GetNext());
 
@@ -656,13 +652,13 @@ static void split_for_stmt(Chunk *start)
          }
       }
    }
-   // Still past width, check for a assignments at parenthese level
+   // Still past width, check for a assignments at parentheses level
    pc = open_paren;
 
    while ((pc = pc->GetNext()) != start)
    {
-      if (  chunk_is_token(pc, CT_ASSIGN)
-         && (pc->level == (open_paren->level + 1)))
+      if (  pc->Is(CT_ASSIGN)
+         && (pc->GetLevel() == (open_paren->GetLevel() + 1)))
       {
          split_before_chunk(pc->GetNext());
 
@@ -686,14 +682,13 @@ static void split_fcn_params_full(Chunk *start)
 
    LOG_FMT(LSPLIT, "  %s(%d): Find the opening function parenthesis\n", __func__, __LINE__);
 
-   while (  (fpo = fpo->GetPrev()) != nullptr
-         && fpo->IsNotNullChunk())
+   while ((fpo = fpo->GetPrev())->IsNotNullChunk())
    {
-      LOG_FMT(LSPLIT, "%s(%d): %s, orig_col is %zu, level is %zu\n",
-              __func__, __LINE__, fpo->Text(), fpo->orig_col, fpo->level);
+      LOG_FMT(LSPLIT, "%s(%d): %s, orig col is %zu, level is %zu\n",
+              __func__, __LINE__, fpo->Text(), fpo->GetOrigCol(), fpo->GetLevel());
 
-      if (  chunk_is_token(fpo, CT_FPAREN_OPEN)
-         && (fpo->level == start->level - 1))
+      if (  fpo->Is(CT_FPAREN_OPEN)
+         && (fpo->GetLevel() == start->GetLevel() - 1))
       {
          break;  // opening parenthesis found. Issue #1020
       }
@@ -703,13 +698,13 @@ static void split_fcn_params_full(Chunk *start)
 
    while (pc->IsNotNullChunk())
    {
-      if (pc->level <= fpo->level)
+      if (pc->GetLevel() <= fpo->GetLevel())
       {
          break;
       }
 
-      if (  (pc->level == (fpo->level + 1))
-         && chunk_is_token(pc, CT_COMMA))
+      if (  (pc->GetLevel() == (fpo->GetLevel() + 1))
+         && pc->Is(CT_COMMA))
       {
          split_before_chunk(pc->GetNext());
       }
@@ -721,26 +716,26 @@ 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->orig_line, start->orig_col);
+   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 (!chunk_is_token(start, CT_FPAREN_OPEN))
+   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()
-            && chunk_is_not_token(fpo, CT_FPAREN_OPEN))
+            && 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->orig_col, fpo->level);
+         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->column;
+   size_t min_col = pc->GetColumn();
 
    log_rule_B("code_width");
    LOG_FMT(LSPLIT, "    mincol is %zu, max_width is %zu\n",
@@ -753,10 +748,9 @@ static void split_fcn_params(Chunk *start)
 
    while (pc->IsNotNullChunk())
    {
-      LOG_FMT(LSPLIT, "%s(%d): pc->Text() '%s', type is %s\n",
-              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
+      LOG_CHUNK(LTOK, pc);
 
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
          cur_width = 0;
          last_col  = -1;
@@ -765,23 +759,23 @@ static void split_fcn_params(Chunk *start)
       {
          if (last_col < 0)
          {
-            last_col = pc->column;
+            last_col = pc->GetColumn();
             LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
                     __func__, __LINE__, last_col);
          }
-         cur_width += (pc->column - last_col) + pc->Len();
-         last_col   = pc->column + pc->Len();
+         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 (  chunk_is_token(pc, CT_COMMA)
-            || chunk_is_token(pc, CT_FPAREN_CLOSE))
+         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->orig_line, pc->orig_col);
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                log_flush(true);
                exit(EX_SOFTWARE);
             }
@@ -792,7 +786,7 @@ static void split_fcn_params(Chunk *start)
             log_rule_B("code_width");
 
             if (  ((last_col - 1) > static_cast<int>(options::code_width()))
-               || chunk_is_token(pc, CT_FPAREN_CLOSE))
+               || pc->Is(CT_FPAREN_CLOSE))
             {
                break;
             }
@@ -804,20 +798,20 @@ static void split_fcn_params(Chunk *start)
    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->level);
+           __func__, __LINE__, prev->Text(), prev->GetLevel());
 
    while ((prev = prev->GetPrev())->IsNotNullChunk())
    {
-      LOG_FMT(LSPLIT, "%s(%d): prev->Text() is '%s', prev->orig_line is %zu, prev->orig_col is %zu\n",
-              __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col);
-      LOG_FMT(LSPLIT, "%s(%d): prev->level is %zu, prev '%s', prev->type is %s\n",
-              __func__, __LINE__, prev->level, prev->Text(), get_token_name(prev->type));
+      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 (  chunk_is_newline(prev)
-         || chunk_is_token(prev, CT_COMMA))
+      if (  prev->IsNewline()
+         || prev->Is(CT_COMMA))
       {
          LOG_FMT(LSPLIT, "%s(%d): found at %zu\n",
-                 __func__, __LINE__, prev->orig_col);
+                 __func__, __LINE__, prev->GetOrigCol());
          break;
       }
       LOG_FMT(LSPLIT, "%s(%d): last_col is %d, prev->Len() is %zu\n",
@@ -826,7 +820,7 @@ static void split_fcn_params(Chunk *start)
       LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
               __func__, __LINE__, last_col);
 
-      if (chunk_is_token(prev, CT_FPAREN_OPEN))
+      if (prev->Is(CT_FPAREN_OPEN))
       {
          pc = prev->GetNext();
 
@@ -835,7 +829,7 @@ static void split_fcn_params(Chunk *start)
          if (!options::indent_paren_nl())
          {
             log_rule_B("indent_columns");
-            min_col = pc->brace_level * options::indent_columns() + 1;
+            min_col = pc->GetBraceLevel() * options::indent_columns() + 1;
             LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
                     __func__, __LINE__, min_col);
 
@@ -855,7 +849,7 @@ static void split_fcn_params(Chunk *start)
          }
 
          // Don't split "()"
-         if (pc->type != E_Token(prev->type + 1))
+         if (pc->GetType() != E_Token(prev->GetType() + 1))
          {
             break;
          }
@@ -863,10 +857,10 @@ static void split_fcn_params(Chunk *start)
    }
 
    if (  prev->IsNotNullChunk()
-      && !chunk_is_newline(prev))
+      && !prev->IsNewline())
    {
       LOG_FMT(LSPLIT, "%s(%d): -- ended on %s --\n",
-              __func__, __LINE__, get_token_name(prev->type));
+              __func__, __LINE__, get_token_name(prev->GetType()));
       LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
               __func__, __LINE__, min_col);
       pc = prev->GetNext();
@@ -890,18 +884,18 @@ static void split_template(Chunk *start)
    {
       LOG_FMT(LSPLIT, "  %s(%d): prev '%s'\n", __func__, __LINE__, prev->Text());
 
-      if (  chunk_is_newline(prev)
-         || chunk_is_token(prev, CT_COMMA))
+      if (  prev->IsNewline()
+         || prev->Is(CT_COMMA))
       {
          break;
       }
    }
 
-   if (  prev != nullptr
-      && !chunk_is_newline(prev))
+   if (  prev->IsNotNullChunk()
+      && !prev->IsNewline())
    {
       LOG_FMT(LSPLIT, "  %s(%d):", __func__, __LINE__);
-      LOG_FMT(LSPLIT, " -- ended on %s --\n", get_token_name(prev->type));
+      LOG_FMT(LSPLIT, " -- ended on %s --\n", get_token_name(prev->GetType()));
       Chunk  *pc = prev->GetNext();
       newline_add_before(pc);
       size_t min_col = 1;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.h
index 3c5ad0b0..73df45e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.h
@@ -15,7 +15,7 @@
  * Step forward until a token goes beyond the limit and then call split_line()
  * to split the line at or before that point.
  */
-void do_code_width(void);
+void do_code_width();
 
 
 #endif /* WIDTH_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/windows_compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/windows_compat.h
index 8210adab..619581b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/windows_compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/windows_compat.h
@@ -13,7 +13,10 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
+
+#ifdef WIN32
 #include "windows.h"
+#endif
 
 #define HAVE_SYS_STAT_H
 
@@ -85,9 +88,11 @@ typedef unsigned long long   UINT64;
 #define fileno         _fileno
 
 // includes for _setmode()
+#ifdef WIN32
 #include <direct.h>
-#include <fcntl.h>
 #include <io.h>
+#endif
+#include <fcntl.h>
 
 // on windows the file permissions have no meaning thus neglect them
 #define mkdir(x, y)    _mkdir(x)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/.editorconfig
index fcea945e..fcea945e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/BRACED_INIT_LIST_found_list.awk
new file mode 100644
index 00000000..b1144618
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/BRACED_INIT_LIST_found_list.awk
@@ -0,0 +1,6 @@
+{
+  zeile = $0;
+  split(zeile, teile, ":");
+  file_name = teile[1];
+  printf("%s\n", file_name);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/CMakeLists.txt
index 13839df9..13839df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/CMakeLists.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c-sharp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c-sharp.test
index 4837a5ae..4837a5ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c-sharp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c-sharp.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c.test
index 584ca033..05bbd247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c.test
@@ -82,6 +82,7 @@
 00123  c/cmt_reflow.cfg                           c/cmt_reflow.c
 
 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
 
 00140  c/ben_071.cfg                              c/global-vars.c
@@ -103,6 +104,10 @@
 00154  common/sp_after_cast.cfg                   c/casts.c
 00155  c/ben_078.cfg                              c/cast_brace.c
 
+00156  c/nl_collapse_empty_1.cfg                  c/empty-braces.c
+00157  c/nl_collapse_empty_2.cfg                  c/empty-braces.c
+00158  c/nl_collapse_empty_3.cfg                  c/empty-braces.c
+00159  c/nl_collapse_empty_4.cfg                  c/empty-braces.c
 
 # fcn indents
 
@@ -116,6 +121,8 @@
 00170  common/empty.cfg                           c/beautifier-off.c
 00180  c/sf538.cfg                                c/lvalue.c
 
+00190  common/empty.cfg                           c/Issue_3559.c
+
 
 # switch & case stuff
 
@@ -149,6 +156,9 @@
 00404  c/align-3.cfg                              c/align-var.c
 00405  c/align-3.cfg                              c/bits.c
 00406  c/bug_i_771.cfg                            c/bug_i_771.c
+00407  c/star-style-0.cfg                         c/star-style.c
+00408  c/star-style-1.cfg                         c/star-style.c
+00409  c/star-style-2.cfg                         c/star-style.c
 
 00411  c/align_typedef_gap-3_span-5.cfg           c/align-typedef.c
 00412  c/align_typedef_gap-3_span-5.cfg           c/align-typedef.c
@@ -164,6 +174,7 @@
 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
 00423  c/bug_1702.cfg                             c/bug_1702.c
+00424  c/Issue_3506.cfg                           c/Issue_3506.c
 
 00430  common/empty.cfg                           c/paren-indent.c
 00431  c/indent_paren_close-1.cfg                 c/paren-indent.c
@@ -186,6 +197,8 @@
 00468  c/align_func_proto_star_amp-8.cfg          c/align_func_proto_star_amp.h
 00469  c/align_func_proto_star_amp-9.cfg          c/align_func_proto_star_amp.h
 
+00470  c/align_trailing_do_cmt.cfg                c/align_trailing_do_cmt.c
+
 # boolean and comma positioning
 
 00501  c/bool-pos-eol.cfg                         c/bool-pos.c
@@ -216,11 +229,17 @@
 00621  c/nl_endif.cfg                             c/nl_endif.c
 00622  c/indent_assign.cfg                        c/indent-off-after-assign.c
 
+00623  c/pp_space_none.cfg                        c/pp_space_before_after.c
+00624  c/pp_space_after.cfg                       c/pp_space_before_after.c
+00625  c/pp_space_before.cfg                      c/pp_space_before_after.c
+00626  c/pp_space_before_after.cfg                c/pp_space_before_after.c
+
 00631  c/nl_assign1.cfg                           c/nl_assign.c
 00632  c/nl_assign2.cfg                           c/nl_assign.c
 00633  c/nl_assign1.cfg                           c/bug_3156.c
 
 # function def newlines
+
 00701  common/func-def-1.cfg                      c/function-def.c
 00702  common/func-def-2.cfg                      c/function-def.c
 00703  common/func-def-3.cfg                      c/function-def.c
@@ -231,6 +250,14 @@
 
 00721  c/nl_semicolon.cfg                         c/nl-semicolon.c
 
+# function call newlines
+
+00730  c/nl_func_call-1.cfg                       c/nl_func_call.c
+00731  c/nl_func_call-2.cfg                       c/nl_func_call.c
+00732  c/nl_func_call-3.cfg                       c/nl_func_call.c
+00733  c/nl_func_call-4.cfg                       c/nl_func_call.c
+00734  c/nl_func_call-5.cfg                       c/nl_func_call.c
+
 # function types
 
 00801  c/ben_084.cfg                              c/fcn_type.c
@@ -359,9 +386,33 @@
 #02503  ger.cfg                                    c/pp_concat_asn1.h
 
 02504  c/align_keep_extra.cfg                     c/align_keep_extra.c
+02505  c/align_multi.cfg                          c/align_assigns.c
+02506  c/align-4.cfg                              c/align_assign_var_defs.c
 
 02510  c/ben_093.cfg                              c/asm.c
 
+02520  c/pp_indent_with_tabs_0.cfg                c/pp_indent_with_tabs.c
+02521  c/pp_indent_with_tabs_1.cfg                c/pp_indent_with_tabs.c
+02522  c/pp_indent_with_tabs_2.cfg                c/pp_indent_with_tabs.c
+02523  c/pp_indent_with_tabs_-1_0.cfg             c/pp_indent_with_tabs.c
+02524  c/pp_indent_with_tabs_-1_1.cfg             c/pp_indent_with_tabs.c
+02525  c/pp_indent_with_tabs_-1_2.cfg             c/pp_indent_with_tabs.c
+
+02530  common/empty.cfg                           c/pp_multiline_define.c
+02531  common/Issue_3052.cfg                      c/pp_multiline_define.c
+02532  c/pp_multiline_define_ignore_body.cfg      c/pp_multiline_define.c
+02533  c/pp_multiline_define_with_spaces.cfg      c/pp_multiline_define.c
+02534  c/pp_multiline_define_align_nl.cfg         c/pp_multiline_define.c
+02535  c/pp_multiline_define_align_pp_col1.cfg    c/pp_multiline_define.c
+02536  c/pp_multiline_define_align_pp_cnt3.cfg    c/pp_multiline_define.c
+02537  c/pp_multiline_define_align_pp_ml4.cfg     c/pp_multiline_define.c
+02538  c/pp_multiline_define_align_pp_ml2.cfg     c/pp_multiline_define.c
+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
+
+02550  c/Issue_3852.cfg                           c/func_var_multi_paren.c
+
 07630  c/indent-vbrace.cfg                        c/indent-vbrace.c
 
 08399  c/ben_095.cfg                              c/gh399.c
@@ -371,8 +422,8 @@
 
 09601  c/sp_after_sparen.cfg                      c/sp_after_sparen.c
 09602  common/bug_671.cfg                         c/bug_671.c
-09603  c/indent_ternary_operator-1.cfg            c/indent_ternary-1.c
-09604  c/indent_ternary_operator-2.cfg            c/indent_ternary-2.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
 09605  common/sp_arith-f.cfg                      c/negative_value.c
 09606  c/ptr-arith.cfg                            c/extern.c
 09607  c/ptr-arith.cfg                            c/attribute.c
@@ -393,7 +444,9 @@
 09620  c/Issue_2640.cfg                           c/Issue_2640.c
 09621  c/preproc-cleanup.cfg                      c/pp-before-func-def.c
 09622  c/Issue_3356.cfg                           c/Issue_3356.c
+09623  c/convert_cmt_vbrace_one_line.cfg          c/vbrace_one_liner.c
 
+10003  common/empty.cfg                           c/incdec_postfix_multiply.c
 10004  c/ben_094.cfg                              c/pragma_asm.c
 10005  common/empty.cfg                           c/i1270.c
 10006  c/bug_2331.cfg                             c/bug_2331.c
@@ -460,3 +513,38 @@
 10066  c/Issue_3580.cfg                           c/Issue_3580.c
 10077  c/Issue_3582.cfg                           c/Issue_3582.c
 10078  c/pp_indent_brace--1.cfg                   c/Issue_3587.h
+10079  c/Issue_3662.cfg                           c/Issue_3662.c
+10080  c/mod_infinite_loop-0.cfg                  c/infinite-loops.c
+10081  c/mod_infinite_loop-1.cfg                  c/infinite-loops.c
+10082  c/mod_infinite_loop-2.cfg                  c/infinite-loops.c
+10083  c/mod_infinite_loop-3.cfg                  c/infinite-loops.c
+10084  c/mod_infinite_loop-4.cfg                  c/infinite-loops.c
+10085  c/mod_infinite_loop-5.cfg                  c/infinite-loops.c
+10086  c/Issue_3716-1.cfg                         c/infinite-loops.c
+10087  c/Issue_3716-2.cfg                         c/infinite-loops.c
+10088  c/Issue_3716-3.cfg                         c/infinite-loops.c
+10089  c/Issue_3716-4.cfg                         c/infinite-loops.c
+10090  c/Issue_3716-5.cfg                         c/infinite-loops.c
+10091  c/mod_short_int-a.cfg                      c/int-types.c
+10092  c/mod_short_int-r.cfg                      c/int-types.c
+10093  c/mod_long_int-a.cfg                       c/int-types.c
+10094  c/mod_long_int-r.cfg                       c/int-types.c
+10095  c/mod_signed_int-a.cfg                     c/int-types.c
+10096  c/mod_signed_int-r.cfg                     c/int-types.c
+10097  c/mod_unsigned_int-a.cfg                   c/int-types.c
+10098  c/mod_unsigned_int-r.cfg                   c/int-types.c
+10099  c/mod_int_short-a.cfg                      c/int-types.c
+10100  c/mod_int_short-r.cfg                      c/int-types.c
+10101  c/mod_int_long-a.cfg                       c/int-types.c
+10102  c/mod_int_long-r.cfg                       c/int-types.c
+10103  c/mod_int_signed-a.cfg                     c/int-types.c
+10104  c/mod_int_signed-r.cfg                     c/int-types.c
+10105  c/mod_int_unsigned-a.cfg                   c/int-types.c
+10106  c/mod_int_unsigned-r.cfg                   c/int-types.c
+10107  c/mod_int-shift-left.cfg                   c/int-types.c
+10108  c/mod_int-shift-right.cfg                  c/int-types.c
+10109  c/mod_int-add-all-prefer-left.cfg          c/int-types.c
+10110  c/mod_int-add-all-prefer-right.cfg         c/int-types.c
+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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/I-842.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/I-842.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/I-842.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/I-842.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.cfg
index 13d5020b..13d5020b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.txt
index f96c1ae8..f96c1ae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_d.cfg
index ddd51138..ddd51138 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_d.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_nd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_nd.cfg
index 23db4460..1fe66176 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_nd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_nd.cfg
@@ -2,4 +2,7 @@ include "mini_d.cfg"
 
 # option with non default setting, should stay the same
 # non default counter = 1
-newlines                        = crlf
+newlines               = crlf
+
+# decode (or not) the flags as a new line.
+debug_decode_the_flags = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/replace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/replace.cfg
index 16473bf2..16473bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/replace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/replace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/tracking_space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/tracking_space.cfg
index 8b37aa38..8b37aa38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/tracking_space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/tracking_space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/truncate.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/truncate.cfg
index cc48c57e..cc48c57e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/truncate.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/truncate.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/unmatched_close_pp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/unmatched_close_pp.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/unmatched_close_pp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/unmatched_close_pp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-3310.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-3310.c
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-3310.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-3310.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-842.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-842.cpp
index 7f7bcaf3..7f7bcaf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-842.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-842.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/backup.h-save b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/backup.h-save
index 9a66578c..9a66578c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/backup.h-save
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/backup.h-save
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/class_enum_struct_union.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/class_enum_struct_union.cpp
index 6a72c823..6a72c823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/class_enum_struct_union.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/class_enum_struct_union.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/replace.list b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/replace.list
index 009e6f33..009e6f33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/replace.list
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/replace.list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrc.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrcP.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrcP.cpp
index 85e36674..85e36674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrcP.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrcP.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/tracking_space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/tracking_space.cpp
index 5b0b8aa1..5b0b8aa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/tracking_space.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/tracking_space.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/truncate.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/truncate.cpp
index 7ef9530d..7ef9530d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/truncate.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/truncate.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/unmatched_close_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/unmatched_close_pp.cpp
index b79d12fd..b79d12fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/unmatched_close_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/unmatched_close_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/21.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/21.txt
index 91ddb8ed..2df9b875 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/21.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/21.txt
@@ -12,11 +12,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 1, pc->column is 1, pc->Text() is 'struct, indent_column is 1
+indent_text : pc->line is 1, pc->GetColumn() is 1, pc->Text() is 'struct, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 1, indent_column set to 1, for 'struct'
+indent_text : orig line is 1, indent_column set to 1, for 'struct'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -32,7 +32,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -49,7 +49,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -66,13 +66,13 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_macro_brace'
 log_rule(indent_text : rule is 'Update the indent_column'
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 2, pc->column is 1, pc->Text() is '{, indent_column is 1
+indent_text : pc->line is 2, pc->GetColumn() is 1, pc->Text() is '{, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 2, indent_column set to 1, for '{'
+indent_text : orig line is 2, indent_column set to 1, for '{'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -85,7 +85,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -99,11 +99,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 3, pc->column is 1, pc->Text() is 'TelegramIndex, indent_column is 9
+indent_text : pc->line is 3, pc->GetColumn() is 1, pc->Text() is 'TelegramIndex, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 3, indent_column set to 9, for 'TelegramIndex'
+indent_text : orig line is 3, indent_column set to 9, for 'TelegramIndex'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
@@ -128,7 +128,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -154,7 +154,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -168,7 +168,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -182,7 +182,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -196,7 +196,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -210,7 +210,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -224,7 +224,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -238,7 +238,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -252,7 +252,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -269,7 +269,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -283,7 +283,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_class_colon'
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
@@ -301,7 +301,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -318,11 +318,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 4, pc->column is 1, pc->Text() is 'pTelName, indent_column is 17
+indent_text : pc->line is 4, pc->GetColumn() is 1, pc->Text() is 'pTelName, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 4, indent_column set to 17, for 'pTelName'
+indent_text : orig line is 4, indent_column set to 17, for 'pTelName'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
@@ -343,7 +343,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -369,7 +369,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -389,7 +389,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -406,7 +406,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -423,7 +423,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -440,11 +440,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 5, pc->column is 1, pc->Text() is 'nTelIndex, indent_column is 17
+indent_text : pc->line is 5, pc->GetColumn() is 1, pc->Text() is 'nTelIndex, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 5, indent_column set to 17, for 'nTelIndex'
+indent_text : orig line is 5, indent_column set to 17, for 'nTelIndex'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
@@ -464,7 +464,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -490,7 +490,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -510,7 +510,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -527,7 +527,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -544,13 +544,13 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_macro_brace'
 log_rule(indent_text : rule is 'Update the indent_column'
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 6, pc->column is 1, pc->Text() is '{, indent_column is 9
+indent_text : pc->line is 6, pc->GetColumn() is 1, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 6, indent_column set to 9, for '{'
+indent_text : orig line is 6, indent_column set to 9, for '{'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -564,7 +564,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -581,11 +581,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 7, pc->column is 1, pc->Text() is '}, indent_column is 9
+indent_text : pc->line is 7, pc->GetColumn() is 1, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 7, indent_column set to 9, for '}'
+indent_text : orig line is 7, indent_column set to 9, for '}'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -599,7 +599,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -613,11 +613,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 9, pc->column is 1, pc->Text() is '~, indent_column is 9
+indent_text : pc->line is 9, pc->GetColumn() is 1, pc->Text() is '~, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 9, indent_column set to 9, for '~'
+indent_text : orig line is 9, indent_column set to 9, for '~'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
@@ -634,7 +634,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -648,7 +648,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -677,7 +677,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -691,7 +691,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -705,13 +705,13 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_macro_brace'
 log_rule(indent_text : rule is 'Update the indent_column'
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 10, pc->column is 1, pc->Text() is '{, indent_column is 9
+indent_text : pc->line is 10, pc->GetColumn() is 1, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 10, indent_column set to 9, for '{'
+indent_text : orig line is 10, indent_column set to 9, for '{'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -725,7 +725,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -742,11 +742,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 11, pc->column is 1, pc->Text() is '}, indent_column is 9
+indent_text : pc->line is 11, pc->GetColumn() is 1, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 11, indent_column set to 9, for '}'
+indent_text : orig line is 11, indent_column set to 9, for '}'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -760,7 +760,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -774,11 +774,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 13, pc->column is 1, pc->Text() is 'const, indent_column is 9
+indent_text : pc->line is 13, pc->GetColumn() is 1, pc->Text() is 'const, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 13, indent_column set to 9, for 'const'
+indent_text : orig line is 13, indent_column set to 9, for 'const'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
@@ -797,7 +797,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -811,7 +811,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -825,7 +825,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -839,7 +839,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_continue'
 log_rule(indent_text : rule is 'indent_xml_string'
@@ -854,7 +854,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -868,7 +868,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -882,11 +882,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 14, pc->column is 1, pc->Text() is 'unsigned, indent_column is 9
+indent_text : pc->line is 14, pc->GetColumn() is 1, pc->Text() is 'unsigned, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 14, indent_column set to 9, for 'unsigned'
+indent_text : orig line is 14, indent_column set to 9, for 'unsigned'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
 log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
@@ -903,7 +903,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -917,7 +917,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_continue'
 log_rule(indent_text : rule is 'indent_xml_string'
@@ -932,7 +932,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -946,7 +946,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -963,11 +963,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 15, pc->column is 1, pc->Text() is '}, indent_column is 1
+indent_text : pc->line is 15, pc->GetColumn() is 1, pc->Text() is '}, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 15, indent_column set to 1, for '}'
+indent_text : orig line is 15, indent_column set to 1, for '}'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -983,7 +983,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1000,7 +1000,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1018,11 +1018,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 1, pc->column is 1, pc->Text() is 'struct, indent_column is 1
+indent_text : pc->line is 1, pc->GetColumn() is 1, pc->Text() is 'struct, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 1, indent_column set to 1, for 'struct'
+indent_text : orig line is 1, indent_column set to 1, for 'struct'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1038,7 +1038,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1055,7 +1055,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1072,13 +1072,13 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_macro_brace'
 log_rule(indent_text : rule is 'Update the indent_column'
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 2, pc->column is 1, pc->Text() is '{, indent_column is 1
+indent_text : pc->line is 2, pc->GetColumn() is 1, pc->Text() is '{, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 2, indent_column set to 1, for '{'
+indent_text : orig line is 2, indent_column set to 1, for '{'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1091,7 +1091,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1105,11 +1105,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 3, pc->column is 9, pc->Text() is 'TelegramIndex, indent_column is 9
+indent_text : pc->line is 3, pc->GetColumn() is 9, pc->Text() is 'TelegramIndex, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 3, indent_column set to 9, for 'TelegramIndex'
+indent_text : orig line is 3, indent_column set to 9, for 'TelegramIndex'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1122,7 +1122,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -1148,7 +1148,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1162,7 +1162,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1176,7 +1176,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1190,7 +1190,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1204,7 +1204,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1218,7 +1218,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1232,7 +1232,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1246,7 +1246,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1263,7 +1263,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1277,7 +1277,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_class_colon'
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
@@ -1295,7 +1295,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1312,11 +1312,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 4, pc->column is 17, pc->Text() is 'pTelName, indent_column is 17
+indent_text : pc->line is 4, pc->GetColumn() is 17, pc->Text() is 'pTelName, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 4, indent_column set to 17, for 'pTelName'
+indent_text : orig line is 4, indent_column set to 17, for 'pTelName'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1332,7 +1332,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -1358,7 +1358,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1378,7 +1378,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1395,7 +1395,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1412,7 +1412,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1429,11 +1429,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 5, pc->column is 17, pc->Text() is 'nTelIndex, indent_column is 17
+indent_text : pc->line is 5, pc->GetColumn() is 17, pc->Text() is 'nTelIndex, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 5, indent_column set to 17, for 'nTelIndex'
+indent_text : orig line is 5, indent_column set to 17, for 'nTelIndex'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1449,7 +1449,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -1475,7 +1475,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1495,7 +1495,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1512,7 +1512,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1529,13 +1529,13 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_macro_brace'
 log_rule(indent_text : rule is 'Update the indent_column'
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 6, pc->column is 9, pc->Text() is '{, indent_column is 9
+indent_text : pc->line is 6, pc->GetColumn() is 9, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 6, indent_column set to 9, for '{'
+indent_text : orig line is 6, indent_column set to 9, for '{'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1548,7 +1548,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1565,11 +1565,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 7, pc->column is 9, pc->Text() is '}, indent_column is 9
+indent_text : pc->line is 7, pc->GetColumn() is 9, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 7, indent_column set to 9, for '}'
+indent_text : orig line is 7, indent_column set to 9, for '}'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1582,7 +1582,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1596,11 +1596,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 9, pc->column is 9, pc->Text() is '~, indent_column is 9
+indent_text : pc->line is 9, pc->GetColumn() is 9, pc->Text() is '~, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 9, indent_column set to 9, for '~'
+indent_text : orig line is 9, indent_column set to 9, for '~'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1613,7 +1613,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1627,7 +1627,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_inside_ternary_operator'
 log_rule(indent_text : rule is 'indent_align_paren'
 log_rule(indent_text : rule is 'indent_paren_nl'
@@ -1656,7 +1656,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1670,7 +1670,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1684,13 +1684,13 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_macro_brace'
 log_rule(indent_text : rule is 'Update the indent_column'
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 10, pc->column is 9, pc->Text() is '{, indent_column is 9
+indent_text : pc->line is 10, pc->GetColumn() is 9, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 10, indent_column set to 9, for '{'
+indent_text : orig line is 10, indent_column set to 9, for '{'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1703,7 +1703,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1720,11 +1720,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 11, pc->column is 9, pc->Text() is '}, indent_column is 9
+indent_text : pc->line is 11, pc->GetColumn() is 9, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 11, indent_column set to 9, for '}'
+indent_text : orig line is 11, indent_column set to 9, for '}'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1737,7 +1737,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1751,11 +1751,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 13, pc->column is 9, pc->Text() is 'const, indent_column is 9
+indent_text : pc->line is 13, pc->GetColumn() is 9, pc->Text() is 'const, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 13, indent_column set to 9, for 'const'
+indent_text : orig line is 13, indent_column set to 9, for 'const'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1768,7 +1768,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1782,7 +1782,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1796,7 +1796,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1810,7 +1810,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_continue'
 log_rule(indent_text : rule is 'indent_xml_string'
@@ -1825,7 +1825,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1839,7 +1839,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1853,11 +1853,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 14, pc->column is 9, pc->Text() is 'unsigned, indent_column is 9
+indent_text : pc->line is 14, pc->GetColumn() is 9, pc->Text() is 'unsigned, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 14, indent_column set to 9, for 'unsigned'
+indent_text : orig line is 14, indent_column set to 9, for 'unsigned'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1870,7 +1870,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1884,7 +1884,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_continue'
 log_rule(indent_text : rule is 'indent_xml_string'
@@ -1899,7 +1899,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1913,7 +1913,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1930,11 +1930,11 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
-indent_text : pc->line is 15, pc->column is 1, pc->Text() is '}, indent_column is 1
+indent_text : pc->line is 15, pc->GetColumn() is 1, pc->Text() is '}, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 15, indent_column set to 1, for '}'
+indent_text : orig line is 15, indent_column set to 1, for '}'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
 log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
@@ -1950,7 +1950,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
@@ -1967,7 +1967,7 @@ log_rule(indent_text : rule is 'indent_braces'
 log_rule(indent_text : rule is 'indent_braces_no_func'
 log_rule(indent_text : rule is 'indent_braces_no_class'
 log_rule(indent_text : rule is 'indent_braces_no_struct'
-indent_text : brace_indent is FAlse
+indent_text : brace_indent is false
 log_rule(indent_text : rule is 'indent_shift'
 log_rule(indent_text : rule is 'indent_xml_string'
 log_rule(indent_text : rule is 'indent_continue_class_head'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/25.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/25.txt
index b801ef15..cf117b66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/25.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/25.txt
@@ -7,14 +7,9 @@ log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
 log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
 log_rule(newlines_brace_pair : rule is 'nl_define_macro'
 log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
-log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
 log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
-newline_add_between : start->Text() is ';', type is SEMICOLON, orig_line is 14, orig_col is 24
-newline_add_between : and end->Text() is '}', orig_line is 15, orig_col is 1
+newline_add_between : start->Text() is ';', type is SEMICOLON, orig line is 14, orig col is 24
+newline_add_between : and end->Text() is '}', orig line is 15, orig col is 1
    [CallStack]
 log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
@@ -43,7 +38,6 @@ log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
@@ -71,7 +65,6 @@ log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
@@ -99,7 +92,6 @@ log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
 log_rule(newlines_cleanup_braces : rule is 'nl_before_opening_brace_func_class_def'
 log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
 log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
@@ -108,13 +100,13 @@ log_rule(newlines_brace_pair : rule is 'nl_define_macro'
 log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
 log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
 log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
-log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
+log_rule(newlines_brace_pair : rule is 'nl_collapse_empty_body'
 log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
-newline_add_between : and end->Text() is '}', orig_line is 7, orig_col is 1
+newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig line is 6, orig col is 1
+newline_add_between : and end->Text() is '}', orig line is 7, orig col is 1
    [CallStack]
-newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
-newline_add_between : and end->Text() is '}', orig_line is 7, orig_col is 1
+newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig line is 6, orig col is 1
+newline_add_between : and end->Text() is '}', orig line is 7, orig col is 1
    [CallStack]
 log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
 log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
@@ -150,7 +142,6 @@ log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
 log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
 log_rule(newlines_cleanup_braces : rule is 'nl_before_opening_brace_func_class_def'
 log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
 log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
@@ -159,13 +150,13 @@ log_rule(newlines_brace_pair : rule is 'nl_define_macro'
 log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
 log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
 log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
-log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
+log_rule(newlines_brace_pair : rule is 'nl_collapse_empty_body'
 log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
-newline_add_between : and end->Text() is '}', orig_line is 11, orig_col is 1
+newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig line is 10, orig col is 1
+newline_add_between : and end->Text() is '}', orig line is 11, orig col is 1
    [CallStack]
-newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
-newline_add_between : and end->Text() is '}', orig_line is 11, orig_col is 1
+newline_add_between : start->Text() is '{', type is BRACE_OPEN, orig line is 10, orig col is 1
+newline_add_between : and end->Text() is '}', orig line is 11, orig col is 1
    [CallStack]
 log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
 log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
@@ -183,10 +174,8 @@ log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
 log_rule(newlines_cleanup_braces : rule is 'eat_blanks_before_close_brace'
 log_rule(newlines_cleanup_braces : rule is 'nl_brace_struct_var'
 log_rule(newlines_cleanup_braces : rule is 'nl_after_semicolon'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
-log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
+log_rule(newline_var_def_blk : rule is 'nl_var_def_blk_start'
+log_rule(newline_var_def_blk : rule is 'nl_var_def_blk_in'
 log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_def'
 log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_proto'
 log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_def'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/28.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/28.txt
new file mode 100644
index 00000000..c1283626
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/28.txt
@@ -0,0 +1,430 @@
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(tokenize : rule is 'newlines'
+brace_cleanup : orig line is 1, orig col is 1, Text() '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, type is STRUCT, Text() is 'struct'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig line is 1, orig col is 8, Text() '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, type is TYPE, Text() is 'TelegramIndex'
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig line is 1, orig col is 21, <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, type is BRACE_OPEN, Text() is '{'
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 2, orig col is 2, <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, type is WORD, Text() is 'TelegramIndex'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig line is 3, orig col is 14, Text() '(', 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, type is PAREN_OPEN, Text() is '('
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig line is 3, orig col is 15, Text() '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, type is QUALIFIER, Text() is 'const'
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
+brace_cleanup : orig line is 3, orig col is 21, Text() '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, type is TYPE, Text() is 'char'
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
+brace_cleanup : orig line is 3, orig col is 25, Text() '*', 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, type is PTR_TYPE, Text() is '*'
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
+brace_cleanup : orig line is 3, orig col is 27, Text() '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, type is WORD, Text() is 'pN'
+parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
+parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
+brace_cleanup : orig line is 3, orig col is 29, Text() ',', 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, type is COMMA, Text() is ','
+parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
+parse_cleanup : frm.stmt_count is 7, frm.expr_count is 5
+brace_cleanup : orig line is 3, orig col is 31, Text() '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, type is TYPE, Text() is 'unsigned'
+parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
+brace_cleanup : orig line is 3, orig col is 40, Text() '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, type is TYPE, Text() is 'long'
+parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
+brace_cleanup : orig line is 3, orig col is 45, Text() '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, type is WORD, Text() is 'nI'
+parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
+brace_cleanup : orig line is 3, orig col is 47, Text() ')', 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, type is PAREN_CLOSE, Text() is ')'
+parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
+parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
+brace_cleanup : orig line is 3, orig col is 49, Text() ':', 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, type is COLON, Text() is ':'
+parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
+parse_cleanup : frm.stmt_count is 12, frm.expr_count is 5
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 3, orig col is 50, <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, type is WORD, Text() is 'pTelName'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig line is 4, orig col is 9, Text() '(', 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, type is PAREN_OPEN, Text() is '('
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig line is 4, orig col is 10, Text() '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, type is WORD, Text() is 'pN'
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
+brace_cleanup : orig line is 4, orig col is 12, Text() ')', 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, type is PAREN_CLOSE, Text() is ')'
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
+brace_cleanup : orig line is 4, orig col is 13, Text() ',', 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, type is COMMA, Text() is ','
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
+brace_cleanup : orig line is 4, orig col is 14, <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, type is WORD, Text() is 'nTelIndex'
+parse_cleanup : frm.stmt_count is 5, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
+brace_cleanup : orig line is 5, orig col is 10, Text() '(', 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, type is PAREN_OPEN, Text() is '('
+parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 7, frm.expr_count is 2
+brace_cleanup : orig line is 5, orig col is 11, Text() '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, type is WORD, Text() is 'n'
+parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
+brace_cleanup : orig line is 5, orig col is 12, Text() ')', 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, type is PAREN_CLOSE, Text() is ')'
+parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
+brace_cleanup : orig line is 5, orig col is 13, <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, type is BRACE_OPEN, Text() is '{'
+parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 6, orig col is 2, <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, type is BRACE_CLOSE, Text() is '}'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 7, orig col is 2, <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, type is INV, Text() is '~'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig line is 9, orig col is 2, Text() '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, type is WORD, Text() is 'TelegramIndex'
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
+brace_cleanup : orig line is 9, orig col is 15, Text() '(', 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, type is PAREN_OPEN, Text() is '('
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 2
+brace_cleanup : orig line is 9, orig col is 16, Text() ')', 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, type is PAREN_CLOSE, Text() is ')'
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
+brace_cleanup : orig line is 9, orig col is 17, <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, type is BRACE_OPEN, Text() is '{'
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 5, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 10, orig col is 2, <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, type is BRACE_CLOSE, Text() is '}'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 11, orig col is 2, <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, type is QUALIFIER, Text() is 'const'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig line is 13, orig col is 7, Text() '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, type is TYPE, Text() is 'char'
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig line is 13, orig col is 11, Text() '*', 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, type is PTR_TYPE, Text() is '*'
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
+brace_cleanup : orig line is 13, orig col is 13, Text() '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, type is QUALIFIER, Text() is 'const'
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
+brace_cleanup : orig line is 13, orig col is 19, Text() '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, type is WORD, Text() is 'pTelName'
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
+parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
+brace_cleanup : orig line is 13, orig col is 27, Text() ';', 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, type is SEMICOLON, Text() is ';'
+parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
+parse_cleanup : frm.stmt_count is 6, frm.expr_count is 6
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 13, orig col is 28, <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, type is TYPE, Text() is 'unsigned'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig line is 14, orig col is 10, Text() '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, type is TYPE, Text() is 'long'
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig line is 14, orig col is 15, Text() '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, type is WORD, Text() is 'nTelIndex'
+parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
+brace_cleanup : orig line is 14, orig col is 24, Text() ';', 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, type is SEMICOLON, Text() is ';'
+parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
+parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 14, orig col is 25, <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, type is BRACE_CLOSE, Text() is '}'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 15, orig col is 2, Text() ';', 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, type is SEMICOLON, Text() is ';'
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig line is 15, orig col is 3, <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
+parameter_pack_cleanup : orig line is 1, orig col is 8, Text() 'TelegramIndex', type is TYPE, PRE is false
+parameter_pack_cleanup : orig line is 1, orig col is 21, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 2, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
+parameter_pack_cleanup : orig line is 2, orig col is 2, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 1, Text() 'TelegramIndex', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 14, Text() '(', type is PAREN_OPEN, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 15, Text() 'const', type is QUALIFIER, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 21, Text() 'char', type is TYPE, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 25, Text() '*', type is PTR_TYPE, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 27, Text() 'pN', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 29, Text() ',', type is COMMA, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 31, Text() 'unsigned', type is TYPE, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 40, Text() 'long', type is TYPE, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 45, Text() 'nI', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 47, Text() ')', type is PAREN_CLOSE, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 49, Text() ':', type is COLON, PRE is false
+parameter_pack_cleanup : orig line is 3, orig col is 50, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 4, orig col is 1, Text() 'pTelName', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 4, orig col is 9, Text() '(', type is PAREN_OPEN, PRE is false
+parameter_pack_cleanup : orig line is 4, orig col is 10, Text() 'pN', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 4, orig col is 12, Text() ')', type is PAREN_CLOSE, PRE is false
+parameter_pack_cleanup : orig line is 4, orig col is 13, Text() ',', type is COMMA, PRE is false
+parameter_pack_cleanup : orig line is 4, orig col is 14, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 5, orig col is 1, Text() 'nTelIndex', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 5, orig col is 10, Text() '(', type is PAREN_OPEN, PRE is false
+parameter_pack_cleanup : orig line is 5, orig col is 11, Text() 'n', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 5, orig col is 12, Text() ')', type is PAREN_CLOSE, PRE is false
+parameter_pack_cleanup : orig line is 5, orig col is 13, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 6, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
+parameter_pack_cleanup : orig line is 6, orig col is 2, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 7, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
+parameter_pack_cleanup : orig line is 7, orig col is 2, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 9, orig col is 1, Text() '~', type is INV, PRE is false
+parameter_pack_cleanup : orig line is 9, orig col is 2, Text() 'TelegramIndex', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 9, orig col is 15, Text() '(', type is PAREN_OPEN, PRE is false
+parameter_pack_cleanup : orig line is 9, orig col is 16, Text() ')', type is PAREN_CLOSE, PRE is false
+parameter_pack_cleanup : orig line is 9, orig col is 17, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 10, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
+parameter_pack_cleanup : orig line is 10, orig col is 2, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 11, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
+parameter_pack_cleanup : orig line is 11, orig col is 2, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 13, orig col is 1, Text() 'const', type is QUALIFIER, PRE is false
+parameter_pack_cleanup : orig line is 13, orig col is 7, Text() 'char', type is TYPE, PRE is false
+parameter_pack_cleanup : orig line is 13, orig col is 11, Text() '*', type is PTR_TYPE, PRE is false
+parameter_pack_cleanup : orig line is 13, orig col is 13, Text() 'const', type is QUALIFIER, PRE is false
+parameter_pack_cleanup : orig line is 13, orig col is 19, Text() 'pTelName', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 13, orig col is 27, Text() ';', type is SEMICOLON, PRE is false
+parameter_pack_cleanup : orig line is 13, orig col is 28, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 14, orig col is 1, Text() 'unsigned', type is TYPE, PRE is false
+parameter_pack_cleanup : orig line is 14, orig col is 10, Text() 'long', type is TYPE, PRE is false
+parameter_pack_cleanup : orig line is 14, orig col is 15, Text() 'nTelIndex', type is WORD, PRE is false
+parameter_pack_cleanup : orig line is 14, orig col is 24, Text() ';', type is SEMICOLON, PRE is false
+parameter_pack_cleanup : orig line is 14, orig col is 25, <Newline>, PRE is false
+parameter_pack_cleanup : orig line is 15, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
+parameter_pack_cleanup : orig line is 15, orig col is 2, Text() ';', type is SEMICOLON, PRE is false
+parameter_pack_cleanup : orig line is 15, orig col is 3, <Newline>, PRE is false
+log_rule(enum_cleanup : rule is 'mod_enum_last_comma'
+newline_var_def_blk : orig line is 1, orig col is 1, Text() 'struct', type is STRUCT, PRE is false
+newline_var_def_blk : orig line is 15, orig col is 3, <Newline>, 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.76.0/tests/cli/output/31.txt
new file mode 100644
index 00000000..d269b195
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/31.txt
@@ -0,0 +1,876 @@
+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'
+   []
+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 : 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'
+   []
+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 : 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 : 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 '{'
+   []
+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 : 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
+indent_text : frm.pse_tos is 1, ...indent_tmp is 9
+reindent_line : orig line is 2, orig col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
+ [CallStack]
+indent_text : pc orig line is 2, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 2, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 2, <Newline>
+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 1, ...indent is 9
+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'
+   []
+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
+ [CallStack]
+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 '('
+   []
+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
+indent_text : frm.pse_tos is 2, ...indent is 23
+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'
+   []
+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'
+   []
+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 '*'
+   []
+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'
+   []
+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 ','
+   []
+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'
+   []
+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'
+   []
+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'
+   []
+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 ')'
+   []
+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 : 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 ':'
+   []
+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
+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 : 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 : 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'
+   []
+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 : 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 '('
+   []
+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 : 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
+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'
+   []
+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 ')'
+   []
+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 : 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 ','
+   []
+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 : 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 : 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'
+   []
+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 : 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 '('
+   []
+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 : 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
+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'
+   []
+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 ')'
+   []
+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 : 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 : 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 '{'
+   []
+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 : frm.pse_tos is 1, ...indent_tmp is 9
+indent_text : frm.pse_tos is 2, ... indent is 17
+indent_text : orig line is 6, orig col is 1, Text() is '{', parent type is FUNC_CLASS_DEF
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+reindent_line : orig line is 6, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+indent_text : pc orig line is 6, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 6, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 6, <Newline>
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+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 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 '}'
+   []
+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 : 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
+ [CallStack]
+indent_text : pc orig line is 7, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 7, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 7, <Newline>
+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 1, ...indent is 9
+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 '~'
+   []
+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
+ [CallStack]
+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'
+   []
+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 '('
+   []
+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
+indent_text : frm.pse_tos is 2, ...indent is 24
+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 ')'
+   []
+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 : 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
+indent_text : orig line is 9, orig col is 17, <Newline>, PRE is false
+indent_text : orig line is 9, <Newline>
+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 1, ...indent is 9
+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 '{'
+   []
+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
+indent_text : orig line is 10, orig col is 1, Text() is '{', parent type is FUNC_CLASS_DEF
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+reindent_line : orig line is 10, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+indent_text : pc orig line is 10, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 10, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 10, <Newline>
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+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 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 '}'
+   []
+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 : 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
+ [CallStack]
+indent_text : pc orig line is 11, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 11, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 11, <Newline>
+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 1, ...indent is 9
+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'
+   []
+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
+ [CallStack]
+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'
+   []
+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 '*'
+   []
+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'
+   []
+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'
+   []
+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 ';'
+   []
+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
+indent_text : orig line is 13, orig col is 28, <Newline>, PRE is false
+indent_text : orig line is 13, <Newline>
+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 1, ...indent is 9
+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'
+   []
+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
+ [CallStack]
+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'
+   []
+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'
+   []
+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 ';'
+   []
+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
+indent_text : orig line is 14, orig col is 25, <Newline>, PRE is false
+indent_text : orig line is 14, <Newline>
+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 1, ...indent is 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 '}'
+   []
+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 : 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
+ [CallStack]
+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 ';'
+   []
+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 : 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 : 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
+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'
+   []
+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 : 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'
+   []
+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 : 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 : 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 '{'
+   []
+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 : 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
+indent_text : frm.pse_tos is 1, ...indent_tmp is 9
+reindent_line : orig line is 2, orig col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
+ [CallStack]
+indent_text : pc orig line is 2, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 2, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 2, <Newline>
+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 1, ...indent is 9
+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'
+   []
+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
+ [CallStack]
+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 '('
+   []
+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
+indent_text : frm.pse_tos is 2, ...indent is 23
+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'
+   []
+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'
+   []
+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 '*'
+   []
+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'
+   []
+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 ','
+   []
+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'
+   []
+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'
+   []
+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'
+   []
+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 ')'
+   []
+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 : 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 ':'
+   []
+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
+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 : 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 : 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'
+   []
+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 : 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 '('
+   []
+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 : 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
+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'
+   []
+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 ')'
+   []
+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 : 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 ','
+   []
+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 : 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 : 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'
+   []
+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 : 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 '('
+   []
+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 : 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
+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'
+   []
+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 ')'
+   []
+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 : 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 : 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 '{'
+   []
+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 : frm.pse_tos is 1, ...indent_tmp is 9
+indent_text : frm.pse_tos is 2, ... indent is 17
+indent_text : orig line is 6, orig col is 1, Text() is '{', parent type is FUNC_CLASS_DEF
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+reindent_line : orig line is 6, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+indent_text : pc orig line is 6, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 6, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 6, <Newline>
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+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 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 '}'
+   []
+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 : 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
+ [CallStack]
+indent_text : pc orig line is 7, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 7, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 7, <Newline>
+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 1, ...indent is 9
+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 '~'
+   []
+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
+ [CallStack]
+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'
+   []
+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 '('
+   []
+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
+indent_text : frm.pse_tos is 2, ...indent is 24
+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 ')'
+   []
+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 : 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
+indent_text : orig line is 9, orig col is 17, <Newline>, PRE is false
+indent_text : orig line is 9, <Newline>
+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 1, ...indent is 9
+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 '{'
+   []
+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
+indent_text : orig line is 10, orig col is 1, Text() is '{', parent type is FUNC_CLASS_DEF
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+reindent_line : orig line is 10, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+indent_text : pc orig line is 10, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 10, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 10, <Newline>
+indent_text : frm.pse_tos is 2, ...indent_tmp is 17
+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 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 '}'
+   []
+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 : 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
+ [CallStack]
+indent_text : pc orig line is 11, orig col is 2, Text() is '', type is NEWLINE
+indent_text : orig line is 11, orig col is 2, <Newline>, PRE is false
+indent_text : orig line is 11, <Newline>
+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 1, ...indent is 9
+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'
+   []
+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
+ [CallStack]
+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'
+   []
+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 '*'
+   []
+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'
+   []
+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'
+   []
+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 ';'
+   []
+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
+indent_text : orig line is 13, orig col is 28, <Newline>, PRE is false
+indent_text : orig line is 13, <Newline>
+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 1, ...indent is 9
+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'
+   []
+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
+ [CallStack]
+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'
+   []
+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'
+   []
+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 ';'
+   []
+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
+indent_text : orig line is 14, orig col is 25, <Newline>, PRE is false
+indent_text : orig line is 14, <Newline>
+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 1, ...indent is 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 '}'
+   []
+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 : 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
+ [CallStack]
+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 ';'
+   []
+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 : 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 : 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
+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.76.0/tests/cli/output/36.txt
new file mode 100644
index 00000000..ed6495d5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/36.txt
@@ -0,0 +1,19 @@
+fix_fcn_def_params : Text() '(', type is PAREN_OPEN, on orig line 3, level is 1
+fix_fcn_def_params : looking at, Text() 'const' on orig line 3, level 2
+fix_fcn_def_params : looking at, Text() 'char' on orig line 3, level 2
+fix_fcn_def_params : looking at, Text() '*' on orig line 3, level 2
+fix_fcn_def_params : looking at, Text() 'pN' on orig line 3, level 2
+fix_fcn_def_params : looking at, Text() ',' on orig line 3, level 2
+mark_variable_stack : parameter on orig line 3, orig col 27:
+mark_variable_stack : parameter on orig line 3, orig col 27: <char> as TYPE
+mark_variable_stack : parameter on orig line 3, orig col 27: <pN> as VAR
+fix_fcn_def_params : looking at, Text() 'unsigned' on orig line 3, level 2
+fix_fcn_def_params : looking at, Text() 'long' on orig line 3, level 2
+fix_fcn_def_params : looking at, Text() 'nI' on orig line 3, level 2
+fix_fcn_def_params : bailed on Text() ')', on orig line 3
+mark_variable_stack : parameter on orig line 3, orig col 45:
+mark_variable_stack : parameter on orig line 3, orig col 45: <long> as TYPE
+mark_variable_stack : parameter on orig line 3, orig col 45: <unsigned> as TYPE
+mark_variable_stack : parameter on orig line 3, orig col 45: <nI> as VAR
+fix_fcn_def_params : Text() '(', type is PAREN_OPEN, on orig line 9, level is 1
+fix_fcn_def_params : bailed on Text() ')', on orig line 9
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/66.txt
new file mode 100644
index 00000000..237507e0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/66.txt
@@ -0,0 +1,800 @@
+space_text : orig line is 1, orig col is 1, 'struct' type is STRUCT
+space_text : back-to-back words need a space: pc->Text() 'struct', next->Text() 'TelegramIndex'
+space_text : orig line is 1, orig col is 1, pc-Text() 'struct', type is STRUCT
+do_space : orig line is 1, orig col is 1, first Text() 'struct', type is STRUCT
+do_space : first orig line is 1, 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'>
+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
+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
+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 : 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 : 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
+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 : 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'>
+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 : 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 : 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 : 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 : 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
+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 : 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'>
+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 : 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'>
+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 : 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 : 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
+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 : 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 : 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 : 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 : 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
+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 : 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 : 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 : 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
+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
+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
+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 : 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 : 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 : 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
+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
+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
+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 : 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'>
+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 : 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 : 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
+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 : 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'>
+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 : 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
+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 : 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'>
+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 : 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'>
+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 : 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
+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 : 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
+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
+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 :    => coldiff is 13
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 3
+space_col_align :    => second orig line is 3
+space_col_align :    => first Text()     is 'TelegramIndex'
+space_col_align :    => second Text()    is '('
+space_col_align :    => first orig col   is 1
+space_col_align :    => second orig col  is 14
+space_col_align :    => first Len()      is 13
+space_col_align :    => coldiff is 13
+space_col_align : first orig line is 3, orig col is 14, [FPAREN_OPEN/FUNC_CLASS_DEF], Text() '(' <==>
+space_col_align : second orig line is 3, orig col is 15 [QUALIFIER/NONE], Text() 'const', [CallStack]
+do_space : orig line is 3, orig col is 14, first Text() '(', type is FPAREN_OPEN
+do_space : first orig line is 3, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 3
+space_col_align :    => second orig line is 3
+space_col_align :    => first Text()     is '('
+space_col_align :    => second Text()    is 'const'
+space_col_align :    => first orig col   is 14
+space_col_align :    => second orig col  is 15
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 3, orig col is 15, [QUALIFIER/NONE], Text() 'const' <==>
+space_col_align : second orig line is 3, orig col is 21 [TYPE/NONE], Text() 'char', [CallStack]
+do_space : orig line is 3, orig col is 15, first Text() 'const', type is QUALIFIER
+do_space : first orig line is 3, 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'>
+space_col_align : av is force
+space_col_align :    Len is 5
+space_col_align :    => coldiff is 5
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 6
+space_col_align : first orig line is 3, orig col is 21, [TYPE/NONE], Text() 'char' <==>
+space_col_align : second orig line is 3, orig col is 25 [PTR_TYPE/NONE], Text() '*', [CallStack]
+do_space : orig line is 3, orig col is 21, first Text() 'char', type is TYPE
+do_space : first orig line is 3, 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 :    => coldiff is 4
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 3
+space_col_align :    => second orig line is 3
+space_col_align :    => first Text()     is 'char'
+space_col_align :    => second Text()    is '*'
+space_col_align :    => first orig col   is 21
+space_col_align :    => second orig col  is 25
+space_col_align :    => first Len()      is 4
+space_col_align :    => coldiff is 4
+space_col_align : first orig line is 3, orig col is 25, [PTR_TYPE/NONE], Text() '*' <==>
+space_col_align : second orig line is 3, orig col is 27 [WORD/NONE], Text() 'pN', [CallStack]
+do_space : orig line is 3, orig col is 25, first Text() '*', type is PTR_TYPE
+do_space : first orig line is 3, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 3
+space_col_align :    => second orig line is 3
+space_col_align :    => first Text()     is '*'
+space_col_align :    => second Text()    is 'pN'
+space_col_align :    => first orig col   is 25
+space_col_align :    => second orig col  is 27
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 2
+space_col_align : first orig line is 3, orig col is 27, [WORD/NONE], Text() 'pN' <==>
+space_col_align : second orig line is 3, orig col is 29 [COMMA/NONE], Text() ',', [CallStack]
+do_space : orig line is 3, orig col is 27, first Text() 'pN', type is WORD
+do_space : first orig line is 3, 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 :    => coldiff is 2
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 2
+space_col_align : first orig line is 3, orig col is 29, [COMMA/NONE], Text() ',' <==>
+space_col_align : second orig line is 3, orig col is 31 [TYPE/NONE], Text() 'unsigned', [CallStack]
+do_space : orig line is 3, orig col is 29, first Text() ',', type is COMMA
+do_space : first orig line is 3, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 3
+space_col_align :    => second orig line is 3
+space_col_align :    => first Text()     is ','
+space_col_align :    => second Text()    is 'unsigned'
+space_col_align :    => first orig col   is 29
+space_col_align :    => second orig col  is 31
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 2
+space_col_align : first orig line is 3, orig col is 31, [TYPE/NONE], Text() 'unsigned' <==>
+space_col_align : second orig line is 3, orig col is 40 [TYPE/NONE], Text() 'long', [CallStack]
+do_space : orig line is 3, orig col is 31, first Text() 'unsigned', type is TYPE
+do_space : first orig line is 3, 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'>
+space_col_align : av is force
+space_col_align :    Len is 8
+space_col_align :    => coldiff is 8
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 9
+space_col_align : first orig line is 3, orig col is 40, [TYPE/NONE], Text() 'long' <==>
+space_col_align : second orig line is 3, orig col is 45 [WORD/NONE], Text() 'nI', [CallStack]
+do_space : orig line is 3, orig col is 40, first Text() 'long', type is TYPE
+do_space : first orig line is 3, 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'>
+space_col_align : av is force
+space_col_align :    Len is 4
+space_col_align :    => coldiff is 4
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 5
+space_col_align : first orig line is 3, orig col is 45, [WORD/NONE], Text() 'nI' <==>
+space_col_align : second orig line is 3, orig col is 47 [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')', [CallStack]
+do_space : orig line is 3, orig col is 45, first Text() 'nI', type is WORD
+do_space : first orig line is 3, 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 :    => coldiff is 2
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 3
+space_col_align :    => second orig line is 3
+space_col_align :    => first Text()     is 'nI'
+space_col_align :    => second Text()    is ')'
+space_col_align :    => first orig col   is 45
+space_col_align :    => second orig col  is 47
+space_col_align :    => first Len()      is 2
+space_col_align :    => coldiff is 2
+space_col_align : first orig line is 3, orig col is 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')' <==>
+space_col_align : second orig line is 3, orig col is 49 [CONSTR_COLON/NONE], Text() ':', [CallStack]
+do_space : orig line is 3, orig col is 47, first Text() ')', type is FPAREN_CLOSE
+do_space : first orig line is 3, 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 :    => coldiff is 1
+space_col_align :    => av is ADD
+space_col_align :    => coldiff is 2
+space_col_align : first orig line is 3, orig col is 49, [CONSTR_COLON/NONE], Text() ':' <==>
+space_col_align : second orig line is 3, orig col is 50 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 3, orig col is 49, first Text() ':', type is CONSTR_COLON
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 4, orig col is 1, [FUNC_CTOR_VAR/NONE], Text() 'pTelName' <==>
+space_col_align : second orig line is 4, orig col is 9 [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(', [CallStack]
+do_space : orig line is 4, orig col is 1, first Text() 'pTelName', type is FUNC_CTOR_VAR
+do_space : first orig line is 4, 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 :    => coldiff is 8
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 4
+space_col_align :    => second orig line is 4
+space_col_align :    => first Text()     is 'pTelName'
+space_col_align :    => second Text()    is '('
+space_col_align :    => first orig col   is 1
+space_col_align :    => second orig col  is 9
+space_col_align :    => first Len()      is 8
+space_col_align :    => coldiff is 8
+space_col_align : first orig line is 4, orig col is 9, [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(' <==>
+space_col_align : second orig line is 4, orig col is 10 [WORD/NONE], Text() 'pN', [CallStack]
+do_space : orig line is 4, orig col is 9, first Text() '(', type is FPAREN_OPEN
+do_space : first orig line is 4, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 4
+space_col_align :    => second orig line is 4
+space_col_align :    => first Text()     is '('
+space_col_align :    => second Text()    is 'pN'
+space_col_align :    => first orig col   is 9
+space_col_align :    => second orig col  is 10
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 4, orig col is 10, [WORD/NONE], Text() 'pN' <==>
+space_col_align : second orig line is 4, orig col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')', [CallStack]
+do_space : orig line is 4, orig col is 10, first Text() 'pN', type is WORD
+do_space : first orig line is 4, 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 :    => coldiff is 2
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 4
+space_col_align :    => second orig line is 4
+space_col_align :    => first Text()     is 'pN'
+space_col_align :    => second Text()    is ')'
+space_col_align :    => first orig col   is 10
+space_col_align :    => second orig col  is 12
+space_col_align :    => first Len()      is 2
+space_col_align :    => coldiff is 2
+space_col_align : first orig line is 4, orig col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')' <==>
+space_col_align : second orig line is 4, orig col is 13 [COMMA/NONE], Text() ',', [CallStack]
+do_space : orig line is 4, orig col is 12, first Text() ')', type is FPAREN_CLOSE
+do_space : first orig line is 4, 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 :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 4, orig col is 13, [COMMA/NONE], Text() ',' <==>
+space_col_align : second orig line is 4, orig col is 14 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 4, orig col is 13, first Text() ',', type is COMMA
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 5, orig col is 1, [FUNC_CTOR_VAR/NONE], Text() 'nTelIndex' <==>
+space_col_align : second orig line is 5, orig col is 10 [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(', [CallStack]
+do_space : orig line is 5, orig col is 1, first Text() 'nTelIndex', type is FUNC_CTOR_VAR
+do_space : first orig line is 5, 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 :    => coldiff is 9
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 5
+space_col_align :    => second orig line is 5
+space_col_align :    => first Text()     is 'nTelIndex'
+space_col_align :    => second Text()    is '('
+space_col_align :    => first orig col   is 1
+space_col_align :    => second orig col  is 10
+space_col_align :    => first Len()      is 9
+space_col_align :    => coldiff is 9
+space_col_align : first orig line is 5, orig col is 10, [FPAREN_OPEN/FUNC_CTOR_VAR], Text() '(' <==>
+space_col_align : second orig line is 5, orig col is 11 [WORD/NONE], Text() 'n', [CallStack]
+do_space : orig line is 5, orig col is 10, first Text() '(', type is FPAREN_OPEN
+do_space : first orig line is 5, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 5
+space_col_align :    => second orig line is 5
+space_col_align :    => first Text()     is '('
+space_col_align :    => second Text()    is 'n'
+space_col_align :    => first orig col   is 10
+space_col_align :    => second orig col  is 11
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 5, orig col is 11, [WORD/NONE], Text() 'n' <==>
+space_col_align : second orig line is 5, orig col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')', [CallStack]
+do_space : orig line is 5, orig col is 11, first Text() 'n', type is WORD
+do_space : first orig line is 5, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 5
+space_col_align :    => second orig line is 5
+space_col_align :    => first Text()     is 'n'
+space_col_align :    => second Text()    is ')'
+space_col_align :    => first orig col   is 11
+space_col_align :    => second orig col  is 12
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 5, orig col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], Text() ')' <==>
+space_col_align : second orig line is 5, orig col is 13 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 5, orig col is 12, first Text() ')', type is FPAREN_CLOSE
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 6, orig col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], Text() '{' <==>
+space_col_align : second orig line is 6, orig col is 2 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 6, orig col is 1, first Text() '{', type is BRACE_OPEN
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 7, orig col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], Text() '}' <==>
+space_col_align : second orig line is 7, orig col is 2 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 7, orig col is 1, first Text() '}', type is BRACE_CLOSE
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 9, orig col is 1, [DESTRUCTOR/FUNC_CLASS_DEF], Text() '~' <==>
+space_col_align : second orig line is 9, orig col is 2 [FUNC_CLASS_DEF/DESTRUCTOR], Text() 'TelegramIndex', [CallStack]
+do_space : orig line is 9, orig col is 1, first Text() '~', type is DESTRUCTOR
+do_space : first orig line is 9, 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 :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 9, orig col is 2, [FUNC_CLASS_DEF/DESTRUCTOR], Text() 'TelegramIndex' <==>
+space_col_align : second orig line is 9, orig col is 15 [FPAREN_OPEN/FUNC_CLASS_DEF], Text() '(', [CallStack]
+do_space : orig line is 9, orig col is 2, first Text() 'TelegramIndex', type is FUNC_CLASS_DEF
+do_space : first orig line is 9, 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 :    => coldiff is 13
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 9
+space_col_align :    => second orig line is 9
+space_col_align :    => first Text()     is 'TelegramIndex'
+space_col_align :    => second Text()    is '('
+space_col_align :    => first orig col   is 2
+space_col_align :    => second orig col  is 15
+space_col_align :    => first Len()      is 13
+space_col_align :    => coldiff is 13
+space_col_align : first orig line is 9, orig col is 15, [FPAREN_OPEN/FUNC_CLASS_DEF], Text() '(' <==>
+space_col_align : second orig line is 9, orig col is 16 [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')', [CallStack]
+do_space : orig line is 9, orig col is 15, first Text() '(', type is FPAREN_OPEN
+do_space : first orig line is 9, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 9
+space_col_align :    => second orig line is 9
+space_col_align :    => first Text()     is '('
+space_col_align :    => second Text()    is ')'
+space_col_align :    => first orig col   is 15
+space_col_align :    => second orig col  is 16
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 9, orig col is 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], Text() ')' <==>
+space_col_align : second orig line is 9, orig col is 17 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 9, orig col is 16, first Text() ')', type is FPAREN_CLOSE
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 10, orig col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], Text() '{' <==>
+space_col_align : second orig line is 10, orig col is 2 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 10, orig col is 1, first Text() '{', type is BRACE_OPEN
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 11, orig col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], Text() '}' <==>
+space_col_align : second orig line is 11, orig col is 2 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 11, orig col is 1, first Text() '}', type is BRACE_CLOSE
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 13, orig col is 1, [QUALIFIER/NONE], Text() 'const' <==>
+space_col_align : second orig line is 13, orig col is 7 [TYPE/NONE], Text() 'char', [CallStack]
+do_space : orig line is 13, orig col is 1, first Text() 'const', type is QUALIFIER
+do_space : first orig line is 13, 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'>
+space_col_align : av is force
+space_col_align :    Len is 5
+space_col_align :    => coldiff is 5
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 6
+space_col_align : first orig line is 13, orig col is 7, [TYPE/NONE], Text() 'char' <==>
+space_col_align : second orig line is 13, orig col is 11 [PTR_TYPE/NONE], Text() '*', [CallStack]
+do_space : orig line is 13, orig col is 7, first Text() 'char', type is TYPE
+do_space : first orig line is 13, 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 :    => coldiff is 4
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 13
+space_col_align :    => second orig line is 13
+space_col_align :    => first Text()     is 'char'
+space_col_align :    => second Text()    is '*'
+space_col_align :    => first orig col   is 7
+space_col_align :    => second orig col  is 11
+space_col_align :    => first Len()      is 4
+space_col_align :    => coldiff is 4
+space_col_align : first orig line is 13, orig col is 11, [PTR_TYPE/NONE], Text() '*' <==>
+space_col_align : second orig line is 13, orig col is 13 [QUALIFIER/NONE], Text() 'const', [CallStack]
+do_space : orig line is 13, orig col is 11, first Text() '*', type is PTR_TYPE
+do_space : first orig line is 13, 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 :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first orig line  is 13
+space_col_align :    => second orig line is 13
+space_col_align :    => first Text()     is '*'
+space_col_align :    => second Text()    is 'const'
+space_col_align :    => first orig col   is 11
+space_col_align :    => second orig col  is 13
+space_col_align :    => first Len()      is 1
+space_col_align :    => coldiff is 2
+space_col_align : first orig line is 13, orig col is 13, [QUALIFIER/NONE], Text() 'const' <==>
+space_col_align : second orig line is 13, orig col is 19 [WORD/NONE], Text() 'pTelName', [CallStack]
+do_space : orig line is 13, orig col is 13, first Text() 'const', type is QUALIFIER
+do_space : first orig line is 13, 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'>
+space_col_align : av is force
+space_col_align :    Len is 5
+space_col_align :    => coldiff is 5
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 6
+space_col_align : first orig line is 13, orig col is 19, [WORD/NONE], Text() 'pTelName' <==>
+space_col_align : second orig line is 13, orig col is 27 [SEMICOLON/NONE], Text() ';', [CallStack]
+do_space : orig line is 13, orig col is 19, first Text() 'pTelName', type is WORD
+do_space : first orig line is 13, 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 :    => coldiff is 8
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 8
+space_col_align : first orig line is 13, orig col is 27, [SEMICOLON/NONE], Text() ';' <==>
+space_col_align : second orig line is 13, orig col is 28 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 13, orig col is 27, first Text() ';', type is SEMICOLON
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first orig line is 14, orig col is 1, [TYPE/NONE], Text() 'unsigned' <==>
+space_col_align : second orig line is 14, orig col is 10 [TYPE/NONE], Text() 'long', [CallStack]
+do_space : orig line is 14, orig col is 1, first Text() 'unsigned', type is TYPE
+do_space : first orig line is 14, 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'>
+space_col_align : av is force
+space_col_align :    Len is 8
+space_col_align :    => coldiff is 8
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 9
+space_col_align : first orig line is 14, orig col is 10, [TYPE/NONE], Text() 'long' <==>
+space_col_align : second orig line is 14, orig col is 15 [WORD/NONE], Text() 'nTelIndex', [CallStack]
+do_space : orig line is 14, orig col is 10, first Text() 'long', type is TYPE
+do_space : first orig line is 14, 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'>
+space_col_align : av is force
+space_col_align :    Len is 4
+space_col_align :    => coldiff is 4
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 5
+space_col_align : first orig line is 14, orig col is 15, [WORD/NONE], Text() 'nTelIndex' <==>
+space_col_align : second orig line is 14, orig col is 24 [SEMICOLON/NONE], Text() ';', [CallStack]
+do_space : orig line is 14, orig col is 15, first Text() 'nTelIndex', type is WORD
+do_space : first orig line is 14, 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 :    => coldiff is 9
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 9
+space_col_align : first orig line is 14, orig col is 24, [SEMICOLON/NONE], Text() ';' <==>
+space_col_align : second orig line is 14, orig col is 25 [NEWLINE/NONE], Text() '', [CallStack]
+do_space : orig line is 14, orig col is 24, first Text() ';', type is SEMICOLON
+space_col_align : av is remove
+space_col_align :    Len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/9.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/9.txt
index 98afe921..98afe921 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/9.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/9.txt
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
new file mode 100644
index 00000000..60a8a584
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/92.txt
@@ -0,0 +1,196 @@
+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/Debug_tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/Debug_tracking_space.html
new file mode 100644
index 00000000..0b5786b1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/Debug_tracking_space.html
@@ -0,0 +1,23 @@
+<html>
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+   <title>Uncrustify: where do the Spaces options work</title>
+</head>
+<body lang="en-US">
+<p>
+</p>
+<pre>
+{<a 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>
+{<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>
+      bool<a title="sp_after_type: 54, 77"><font color="red">M</font></a>b<a title="sp_assign: 55, 78, 372"><font color="red">M</font></a>=<a title="sp_assign: 56, 79, 373, 378"><font color="red">M</font></a>x<a title="sp_compare: 57, 80, 374, 379, 383"><font color="red">M</font></a>><a title="sp_compare: 58, 81, 375, 380, 384, 387"><font color="red">M</font></a>1<a title="sp_before_semi: 59, 82, 376, 381, 385, 388, 390"><font color="red">M</font></a>;<a title="REMOVE: 60, 83, 377, 382, 386, 389, 391, 392"><font color="red">M</font></a>
+   }<a title="REMOVE: 61, 84"><font color="red">M</font></a>
+}<a title="sp_before_semi: 62"><font color="red">M</font></a>;<a title="REMOVE: 63, 393"><font color="red">M</font></a>
+</pre>
+</body>
+</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/I-842.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/I-842.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/I-842.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/I-842.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/backup.h
index 210c6f7c..210c6f7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.csv b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/class_enum_struct_union.csv
index 3b5c4a4e..c441a593 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.csv
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/class_enum_struct_union.csv
@@ -48,7 +48,7 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 26,PAREN_OPEN,NONE,PARENT_NOT_SET,35,35,36,0,1,2,1,"IN_PREPROC,EXPR_START,PUNCTUATOR",0,0,"                                   ("
 26,FUNC_CALL,NONE,PARENT_NOT_SET,36,36,46,0,1,3,1,"IN_PREPROC,EXPR_START",0,0,"                                    visibility"
 26,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,46,46,47,0,1,3,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                              ("
-26,STRING,PP_INCLUDE,PARENT_NOT_SET,47,47,56,0,1,4,1,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                               ""default"""
+26,STRING,NONE,PARENT_NOT_SET,47,47,56,0,1,4,1,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                               ""default"""
 26,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,56,56,57,0,1,3,1,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                                                        )"
 26,PAREN_CLOSE,NONE,PARENT_NOT_SET,57,57,58,0,1,2,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                         )"
 26,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,58,58,59,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                          )"
@@ -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",0,0,"                                                                                ?"
-89,WORD,NONE,PARENT_NOT_SET,82,82,85,1,0,0,0,"EXPR_START",0,0,"                                                                                  c32"
-89,COND_COLON,NONE,PARENT_NOT_SET,86,86,87,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                      :"
-89,WORD,NONE,PARENT_NOT_SET,88,88,95,1,0,0,0,"STMT_START,EXPR_START",0,0,"                                                                                        nullptr"
-89,COMMA,NONE,PARENT_NOT_SET,95,95,96,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                               ,"
-89,PTR_TYPE,CLASS,PARENT_NOT_SET,97,97,98,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                                 *"
-89,WORD,NONE,PARENT_NOT_SET,98,98,101,0,0,0,0,"EXPR_START,VAR_DEF",0,0,"                                                                                                  c43"
-89,TSQUARE,NONE,PARENT_NOT_SET,101,101,103,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                     []"
-89,ASSIGN,NONE,PARENT_NOT_SET,104,104,105,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                                        ="
-89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,106,106,107,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                                                                                          {"
-89,WORD,NONE,PARENT_NOT_SET,108,108,115,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                            nullptr"
-89,COMMA,NONE,PARENT_NOT_SET,115,115,116,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                   ,"
-89,WORD,NONE,PARENT_NOT_SET,117,117,124,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                     nullptr"
-89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,125,125,126,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                             }"
-89,COMMA,NONE,PARENT_NOT_SET,126,126,127,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                              ,"
-89,WORD,NONE,PARENT_NOT_SET,128,128,131,1,0,0,0,"EXPR_START,VAR_DEF,LVALUE",0,0,"                                                                                                                                c44"
-89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,131,131,132,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                   {"
-89,NUMBER,NONE,PARENT_NOT_SET,133,133,134,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                                                                                                     0"
-89,COMMA,NONE,PARENT_NOT_SET,134,134,135,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                      ,"
-89,NUMBER,NONE,PARENT_NOT_SET,136,136,137,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                                        1"
-89,COMMA,NONE,PARENT_NOT_SET,137,137,138,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                         ,"
-89,NUMBER,NONE,PARENT_NOT_SET,139,139,140,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                                           2"
-89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,140,140,141,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                            }"
-89,COMMA,NONE,PARENT_NOT_SET,141,141,142,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                             ,"
-89,PTR_TYPE,CLASS,PARENT_NOT_SET,143,143,144,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                                                                               *"
-89,QUALIFIER,NONE,PARENT_NOT_SET,145,145,150,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                                                                                                                                                 const"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,151,151,154,1,0,0,0,"VAR_DEF",0,0,"                                                                                                                                                       c45"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,154,154,155,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                          ("
-89,WORD,NONE,PARENT_NOT_SET,155,155,162,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                           nullptr"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,162,162,163,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                  )"
-89,COMMA,NONE,PARENT_NOT_SET,163,163,164,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                   ,"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,165,165,168,1,0,0,0,"EXPR_START,VAR_DEF",0,0,"                                                                                                                                                                     c46"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,168,168,169,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                        ("
-89,NUMBER,NONE,PARENT_NOT_SET,169,169,170,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                         0"
-89,COMMA,NONE,PARENT_NOT_SET,170,170,171,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                          ,"
-89,NUMBER,NONE,PARENT_NOT_SET,172,172,173,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                            1"
-89,COMMA,NONE,PARENT_NOT_SET,173,173,174,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                             ,"
-89,NUMBER,NONE,PARENT_NOT_SET,175,175,176,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                               2"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,176,176,177,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                                )"
-89,SEMICOLON,CLASS,PARENT_NOT_SET,177,177,178,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                                 ;"
+89,QUESTION,NONE,PARENT_NOT_SET,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,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,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,
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.76.0/tests/cli/output/class_enum_struct_union.txt
new file mode 100644
index 00000000..c52e7000
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/class_enum_struct_union.txt
@@ -0,0 +1,692 @@
+
+# option(s) with 'not default' value: 0
+#
+# -=====-
+# number of loops               = 1
+# -=====-
+# language                      = CPP
+# -=====-
+# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp             Flags   Nl  Text
+#   1>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  3][0/0/0][                  0][9-0] /**␤    * the enum (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * "enum type [: integral_type] { ... } [x, ...]"␤    * "enum type [: integral_type]"␤    * "enum class type [: integral_type] { ... } [x, ...]"␤    * "enum class type [: integral_type]"␤    * "enum [: integral_type] { ... } x, ..."␤    */
+#  10>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  4/  0][0/0/0][                  0][2-0]
+#  12>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  0][0/0/0][                  0][9-0] /**␤    * the class/struct (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }␤    * template<...> class/struct[<...>] [macros/attributes ...] type␤    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]␤    * class/struct [macros/attributes ...] type [x, ...]␤    * class/struct [macros/attributes ...] [: bases] { } x, ...␤    */
+#  21>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][                  0][2-0]
+#  23>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][        2 001c 0001][0-0] #
+#  23>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/0][             2 0001][0-0]  define
+#  23>         MACRO_FUNC|               NONE|     PARENT_NOT_SET[  9/  9/ 16/  1][1/1/0][             8 0001][0-0]         ALIGNAS
+#  23>        FPAREN_OPEN|         MACRO_FUNC|     PARENT_NOT_SET[ 16/ 16/ 17/  0][1/1/0][        2 0000 0001][0-0]                (
+#  23>               WORD|               NONE|     PARENT_NOT_SET[ 17/ 17/ 31/  0][1/2/0][             8 0011][0-0]                 byte_alignment
+#  23>       FPAREN_CLOSE|         MACRO_FUNC|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][        2 0000 0011][0-0]                               )
+#  23>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 33/ 33/ 46/  1][1/1/0][                  1][0-0]                                 __attribute__
+#  23>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/1/0][        2 0000 0001][0-0]                                              (
+#  23>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][1/2/0][        2 0008 0001][0-0]                                               (
+#  23>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 55/  0][1/3/0][             8 0001][0-0]                                                aligned
+#  23>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 55/ 55/ 56/  0][1/3/0][        2 0000 0001][0-0]                                                       (
+#  23>               WORD|               NONE|     PARENT_NOT_SET[ 56/ 56/ 70/  0][1/4/0][             8 0011][0-0]                                                        byte_alignment
+#  23>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 70/ 70/ 71/  0][1/3/0][        2 0000 0011][0-0]                                                                      )
+#  23>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 72/  0][1/2/0][        2 0000 0001][0-0]                                                                       )
+#  23>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 72/ 72/ 73/  0][1/1/0][        2 0000 0001][0-0]                                                                        )
+#  23>            NEWLINE|               NONE|     PARENT_NOT_SET[ 73/ 73/  1/  0][0/0/0][                  0][2-0]
+#  25>            PREPROC|              PP_IF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0010 0001][0-0] #
+#  25>              PP_IF|               NONE|     PARENT_NOT_SET[  2/  2/  4/  0][0/0/1][             2 0001][0-0]  if
+#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  5/  5/ 12/  1][0/0/1][             8 0001][0-0]     defined
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/1][        2 0000 0001][0-0]             (
+#  25>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 22/  0][0/0/1][             8 0001][0-0]              __unix__
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/1][        2 0000 0001][0-0]                      )
+#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][0/0/1][        2 0000 0001][0-0]                        ||
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/1][        2 0000 0001][0-0]                           (
+#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 28/ 28/ 35/  0][0/0/1][             8 0001][0-0]                            defined
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  1][0/0/1][        2 0000 0001][0-0]                                    (
+#  25>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 46/  0][0/0/1][             8 0001][0-0]                                     __APPLE__
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][0/0/1][        2 0000 0001][0-0]                                              )
+#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  1][0/0/1][        2 0000 0001][0-0]                                                &&
+#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 51/ 51/ 58/  1][0/0/1][                  1][0-0]                                                   defined
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  1][0/0/1][        2 0000 0001][0-0]                                                           (
+#  25>               WORD|               NONE|     PARENT_NOT_SET[ 60/ 60/ 68/  0][0/0/1][             8 0001][0-0]                                                            __MACH__
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/1][        2 0000 0001][0-0]                                                                    )
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 69/ 69/ 70/  0][0/0/1][        2 0000 0001][0-0]                                                                     )
+#  25>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/1][                  0][1-0]
+#  26>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][        2 001c 0001][0-0] #
+#  26>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][             2 0001][0-0]  define
+#  26>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][             2 0001][0-0]         API_EXPORT
+#  26>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 20/ 20/ 33/  1][1/1/1][             8 0001][0-0]                    __attribute__
+#  26>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 34/ 34/ 35/  1][1/1/1][        2 000c 0001][0-0]                                  (
+#  26>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/2/1][        2 0008 0001][0-0]                                   (
+#  26>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 36/ 36/ 46/  0][1/3/1][             8 0001][0-0]                                    visibility
+#  26>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/3/1][        2 0000 0001][0-0]                                              (
+#  26>             STRING|               NONE|     PARENT_NOT_SET[ 47/ 47/ 56/  0][1/4/1][             8 0011][0-0]                                               "default"
+#  26>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 56/ 56/ 57/  0][1/3/1][        2 0000 0011][0-0]                                                        )
+#  26>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 57/ 57/ 58/  0][1/2/1][        2 0000 0001][0-0]                                                         )
+#  26>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][1/1/1][        2 0000 0001][0-0]                                                          )
+#  26>            NEWLINE|               NONE|     PARENT_NOT_SET[ 59/ 59/  1/  0][0/0/1][                  0][1-0]
+#  27>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0010 0001][0-0] #
+#  27>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][             2 0001][0-0]  elif
+#  27>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/1][             a 0001][0-0]       defined
+#  27>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 21/  1][0/0/1][                  1][0-0]               _WIN32
+#  27>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/1][                  0][1-0]
+#  28>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][        2 001c 0001][0-0] #
+#  28>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][             2 0001][0-0]  define
+#  28>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][             2 0001][0-0]         API_EXPORT
+#  28>           DECLSPEC|               NONE|     PARENT_NOT_SET[ 20/ 20/ 30/  1][1/1/1][             c 0001][0-0]                    __declspec
+#  28>         PAREN_OPEN|           DECLSPEC|     PARENT_NOT_SET[ 30/ 30/ 31/  0][1/1/1][        2 0000 0001][0-0]                              (
+#  28>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 40/  0][1/2/1][             8 0001][0-0]                               dllexport
+#  28>        PAREN_CLOSE|           DECLSPEC|     PARENT_NOT_SET[ 40/ 40/ 41/  0][1/1/1][        2 0000 0001][0-0]                                        )
+#  28>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 41/  1/  0][0/0/1][                  0][1-0]
+#  29>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0010 0001][0-0] #
+#  29>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][                  1][0-0]  else
+#  29>            NEWLINE|               NONE|     PARENT_NOT_SET[  6/  6/  1/  0][0/0/1][                  0][1-0]
+#  30>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][        2 001c 0001][0-0] #
+#  30>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][             2 0001][0-0]  define
+#  30>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][                  1][0-0]         API_EXPORT
+#  30>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/1][                  0][1-0]
+#  31>            PREPROC|           PP_ENDIF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0010 0001][0-0] #
+#  31>           PP_ENDIF|               NONE|              PP_IF[  2/  2/  7/  0][0/0/0][                  1][0-0]  endif
+#  31>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][                  0][2-0]
+#  33>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][0/0/0][             e 0000][0-0] namespace
+#  33>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][0/0/0][                  0][0-0]           outer_namespace
+#  33>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][0/0/0][                  0][1-0]
+#  34>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0000][0-0] {
+#  34>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][               1000][2-0]
+#  36>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][1/1/0][             e 1000][0-0] namespace
+#  36>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][1/1/0][               1000][0-0]           inner_namespace
+#  36>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][1/1/0][               1000][1-0]
+#  37>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][        2 0000 1000][0-0] {
+#  37>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][2/2/0][               1000][2-0]
+#  39>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][2/2/0][             e 1000][0-0] class
+#  39>               TYPE|              CLASS|     PARENT_NOT_SET[  7/  7/ 12/  1][2/2/0][               1000][0-0]       Base1
+#  39>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 13/ 13/ 14/  1][2/2/0][        2 c000 1400][0-0]             {
+#  39>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 15/ 15/ 16/  1][2/2/0][        2 c000 1400][0-0]               }
+#  39>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 16/ 16/ 17/  0][2/2/0][        2 0000 0000][0-0]                ;
+#  39>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][2/2/0][                  0][2-0]
+#  41>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][2/2/0][             c 0000][0-0] template
+#  41>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][2/2/0][        2 0000 0040][0-0]         <
+#  41>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][2/3/0][             8 0040][0-0]          typename
+#  41>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][2/2/0][        2 0000 0040][0-0]                  >
+#  41>              CLASS|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 25/  1][2/2/0][             a 0000][0-0]                    class
+#  41>               TYPE|              CLASS|     PARENT_NOT_SET[ 26/ 26/ 31/  1][2/2/0][                  0][0-0]                          Base2
+#  41>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 32/ 32/ 33/  1][2/2/0][        2 c000 0400][0-0]                                {
+#  41>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 34/ 34/ 35/  1][2/2/0][        2 c000 0400][0-0]                                  }
+#  41>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 35/ 35/ 36/  0][2/2/0][        2 0000 0000][0-0]                                   ;
+#  41>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 36/  1/  0][2/2/0][                  0][2-0]
+#  43>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][        2 0000 0000][0-0] }
+#  43>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][                  0][2-0]
+#  45>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0000][0-0] }
+#  45>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][0/0/0][                  0][2-0]
+#  47>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 82/  0][0/0/0][                  0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }
+#  47>            NEWLINE|               NONE|     PARENT_NOT_SET[ 82/ 82/  1/  0][0/0/0][                  0][1-0]
+#  48>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][             c 0000][0-0] template
+#  48>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][        2 0000 0040][0-0]         <
+#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][             8 0040][0-0]          typename
+#  48>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][        2 0000 0040][0-0]                  ,
+#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][             8 0040][0-0]                    typename
+#  48>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][        2 0000 0040][0-0]                             ...
+#  48>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][        2 0000 0040][0-0]                                >
+#  48>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][                  0][1-0]
+#  49>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][             a 0000][0-0] class
+#  49>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][             2 0000][0-0]       API_EXPORT
+#  49>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][                  0][0-0]                  __attribute__
+#  49>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][        2 0000 0000][0-0]                               (
+#  49>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][        2 0008 0000][0-0]                                (
+#  49>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][             8 0000][0-0]                                 __deprecated__
+#  49>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][        2 0000 0000][0-0]                                               )
+#  49>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][        2 0000 0000][0-0]                                                )
+#  49>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][                  0][0-0]                                                  ALIGNAS
+#  49>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][        2 0000 0000][0-0]                                                         (
+#  49>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][             8 0000][0-0]                                                          4
+#  49>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][        2 0000 0000][0-0]                                                           )
+#  49>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][                  0][0-0]                                                             c1
+#  49>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][                  0][1-0]
+#  50>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][        2 0000 0800][0-0]         :
+#  50>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][             e 0800][0-0]           public
+#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][                800][0-0]                  outer_namespace
+#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][        2 0000 0800][0-0]                                 ::
+#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][                800][0-0]                                   inner_namespace
+#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][        2 0000 0800][0-0]                                                  ::
+#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][                800][0-0]                                                    Base1
+#  50>              COMMA|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][        2 0000 0800][0-0]                                                         ,
+#  50>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  3/  0][0/0/0][                  0][1-0]
+#  51>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][             a 0800][0-0]         public
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 25/  1][0/0/0][                800][0-0]                outer_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 31/ 25/ 27/  0][0/0/0][        2 0000 0800][0-0]                               ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 33/ 27/ 42/  0][0/0/0][                800][0-0]                                 inner_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 42/ 44/  0][0/0/0][        2 0000 0800][0-0]                                                ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 50/ 44/ 49/  0][0/0/0][                800][0-0]                                                  Base2
+#  51>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 55/ 49/ 50/  0][0/0/0][        2 0000 0840][0-0]                                                       <
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 56/ 50/ 65/  0][0/1/0][             8 0840][0-0]                                                        outer_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 71/ 65/ 67/  0][0/1/0][        2 0000 0840][0-0]                                                                       ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 73/ 67/ 82/  0][0/1/0][                840][0-0]                                                                         inner_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 88/ 82/ 84/  0][0/1/0][        2 0000 0840][0-0]                                                                                        ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 90/ 84/ 89/  0][0/1/0][                840][0-0]                                                                                          Base1
+#  51>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 95/ 89/ 90/  0][0/0/0][        2 0000 0840][0-0]                                                                                               >
+#  51>            NEWLINE|               NONE|     PARENT_NOT_SET[ 96/ 90/  1/  0][0/0/0][                  0][1-0]
+#  52>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 8008 0400][0-0] {
+#  52>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][                400][2-0]
+#  54>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 8000 0400][0-0] }
+#  54>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][        2 0000 0000][0-0]  ;
+#  54>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][                  0][2-0]
+#  56>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 70/  0][0/0/0][                  0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type { }
+#  56>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/0][                  0][1-0]
+#  57>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][             c 0000][0-0] template
+#  57>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][        2 0000 0040][0-0]         <
+#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][             8 0040][0-0]          typename
+#  57>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][        2 0000 0040][0-0]                  ,
+#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][             8 0040][0-0]                    typename
+#  57>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][        2 0000 0040][0-0]                             ...
+#  57>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][        2 0000 0040][0-0]                                >
+#  57>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][                  0][1-0]
+#  58>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][             a 0000][0-0] class
+#  58>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][             2 0000][0-0]       API_EXPORT
+#  58>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][                  0][0-0]                  c2
+#  58>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][                  0][1-0]
+#  59>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0400][0-0] {
+#  59>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][                400][1-0]
+#  60>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][             c 0400][0-0] public
+#  60>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][        2 0000 0400][0-0]       :
+#  60>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][                400][2-0]
+#  62>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  4/ 12/  0][1/1/0][             c 0400][0-0] template
+#  62>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/ 12/ 13/  0][1/1/0][        2 0000 0440][0-0]         <
+#  62>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 13/ 21/  0][1/2/0][             a 0440][0-0]          typename
+#  62>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][                440][0-0]                   T
+#  62>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 20/ 23/ 24/  0][1/1/0][        2 0000 0440][0-0]                    >
+#  62>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 24/  4/  0][1/1/0][                400][1-0]
+#  63>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[  1/  4/ 10/  0][1/1/0][             a 0400][0-0] struct
+#  63>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/ 11/ 22/  1][1/1/0][                400][0-0]        inner_class
+#  63>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 22/  4/  0][1/1/0][                400][1-0]
+#  64>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][        2 0000 0400][0-0] {
+#  64>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  5/  7/  0][2/2/0][                402][1-0]
+#  65>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  7/ 13/  0][2/2/0][            8e 0402][0-0]         static
+#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 14/ 25/  1][2/2/0][            80 0402][0-0]                inner_class
+#  65>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 27/ 25/ 26/  0][2/2/0][        2 0000 0442][0-0]                           <
+#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 28/ 26/ 27/  0][2/3/0][             8 0442][0-0]                            T
+#  65>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 29/ 27/ 28/  0][2/2/0][        2 0000 0442][0-0]                             >
+#  65>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 31/ 29/ 30/  1][2/2/0][        2 0088 0402][0-0]                               *
+#  65>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 30/ 43/  0][2/2/0][           308 0402][0-0]                                m_inner_class
+#  65>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 45/ 43/ 44/  0][2/2/0][        2 0000 0402][0-0]                                             ;
+#  65>            NEWLINE|               NONE|     PARENT_NOT_SET[ 46/ 44/  4/  0][2/2/0][                402][1-0]
+#  66>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][        2 0000 0402][0-0] }
+#  66>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  5/  6/  0][1/1/0][        2 0000 0400][0-0]  ;
+#  66>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  6/  1/  0][1/1/0][                400][1-0]
+#  67>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0400][0-0] }
+#  67>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][        2 0000 0000][0-0]  ;
+#  67>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][                  0][2-0]
+#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][             c 0000][0-0] template
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][        2 0000 0040][0-0]         <
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][0/0/0][        2 0008 0040][0-0]          >
+#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[ 12/ 12/ 20/  1][0/0/0][             8 0000][0-0]            template
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][        2 0000 0040][0-0]                    <
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/0/0][        2 0008 0040][0-0]                     >
+#  69>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[ 23/ 23/ 29/  1][0/0/0][             a 0000][0-0]                       struct
+#  69>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 40/  1][0/0/0][             2 0000][0-0]                              API_EXPORT
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 41/ 41/ 43/  1][0/0/0][                  0][0-0]                                         c2
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][        2 0000 0040][0-0]                                           <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 44/ 44/ 47/  0][0/1/0][             8 0040][0-0]                                            int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/0/0][        2 0000 0040][0-0]                                               >
+#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  0][0/0/0][        2 0008 0000][0-0]                                                ::
+#  69>               TYPE|             STRUCT|     PARENT_NOT_SET[ 50/ 50/ 61/  0][0/0/0][            80 0000][0-0]                                                  inner_class
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][0/0/0][        2 0000 0040][0-0]                                                             <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/1/0][             8 0040][0-0]                                                              int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][        2 0000 0040][0-0]                                                                 >
+#  69>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  1][0/0/0][        2 0008 0000][0-0]                                                                   *
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 70/  0][0/0/0][             8 0000][0-0]                                                                    c2
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 70/ 70/ 71/  0][0/0/0][        2 0000 0040][0-0]                                                                      <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 74/  0][0/1/0][             8 0040][0-0]                                                                       int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 74/ 74/ 75/  0][0/0/0][        2 0000 0040][0-0]                                                                          >
+#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 75/ 75/ 77/  0][0/0/0][        2 0008 0000][0-0]                                                                           ::
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 77/ 77/ 88/  0][0/0/0][                  0][0-0]                                                                             inner_class
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 88/ 88/ 89/  0][0/0/0][        2 0000 0040][0-0]                                                                                        <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 89/ 89/ 92/  0][0/1/0][             8 0040][0-0]                                                                                         int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 92/ 92/ 93/  0][0/0/0][        2 0000 0040][0-0]                                                                                            >
+#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 93/ 93/ 95/  0][0/0/0][        2 0008 0000][0-0]                                                                                             ::
+#  69>               WORD|               NONE|     PARENT_NOT_SET[ 95/ 95/108/  0][0/0/0][          2300 0000][0-0]                                                                                               m_inner_class
+#  69>             ASSIGN|               NONE|     PARENT_NOT_SET[109/109/110/  1][0/0/0][        2 0000 0000][0-0]                                                                                                             =
+#  69>               WORD|               NONE|     PARENT_NOT_SET[111/111/118/  1][0/0/0][             8 0000][0-0]                                                                                                               nullptr
+#  69>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[118/118/119/  0][0/0/0][        2 0000 0000][0-0]                                                                                                                      ;
+#  69>            NEWLINE|               NONE|     PARENT_NOT_SET[119/119/  1/  0][0/0/0][                  0][2-0]
+#  71>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 66/  0][0/0/0][                  0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type
+#  71>            NEWLINE|               NONE|     PARENT_NOT_SET[ 66/ 66/  1/  0][0/0/0][                  0][1-0]
+#  72>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][             c 0000][0-0] template
+#  72>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][        2 0000 0040][0-0]         <
+#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][             8 0040][0-0]          typename
+#  72>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][        2 0000 0040][0-0]                  ,
+#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][             8 0040][0-0]                    typename
+#  72>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][        2 0000 0040][0-0]                             ...
+#  72>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][        2 0000 0040][0-0]                                >
+#  72>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][                  0][1-0]
+#  73>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][     1000 000a 0000][0-0] class
+#  73>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][     1000 0002 0000][0-0]       API_EXPORT
+#  73>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][     1000 0000 0000][0-0]                  c2
+#  73>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][        2 0000 0000][0-0]                    ;
+#  73>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/0][                  0][2-0]
+#  75>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][                  0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
+#  75>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][                  0][1-0]
+#  76>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][             e 0000][0-0] class
+#  76>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][             2 0000][0-0]       API_EXPORT
+#  76>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][                  0][0-0]                  __attribute__
+#  76>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][        2 0000 0000][0-0]                               (
+#  76>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][        2 0008 0000][0-0]                                (
+#  76>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][             8 0000][0-0]                                 __deprecated__
+#  76>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][        2 0000 0000][0-0]                                               )
+#  76>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][        2 0000 0000][0-0]                                                )
+#  76>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][                  0][0-0]                                                  ALIGNAS
+#  76>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][        2 0000 0000][0-0]                                                         (
+#  76>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][             8 0000][0-0]                                                          4
+#  76>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][        2 0000 0000][0-0]                                                           )
+#  76>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][            80 0000][0-0]                                                             c3
+#  76>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][                  0][1-0]
+#  77>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][        2 0000 0800][0-0]         :
+#  77>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][             e 0800][0-0]           public
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][                800][0-0]                  outer_namespace
+#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][        2 0000 0800][0-0]                                 ::
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][                800][0-0]                                   inner_namespace
+#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][        2 0000 0800][0-0]                                                  ::
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][                800][0-0]                                                    Base2
+#  77>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][        2 0000 0840][0-0]                                                         <
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 58/ 50/ 53/  0][0/1/0][             8 0840][0-0]                                                          int
+#  77>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 61/ 53/ 54/  0][0/0/0][        2 0000 0840][0-0]                                                             >
+#  77>              COMMA|               NONE|     PARENT_NOT_SET[ 62/ 54/ 55/  0][0/0/0][        2 0008 0800][0-0]                                                              ,
+#  77>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 55/  3/  0][0/0/0][                  0][1-0]
+#  78>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][             a 0800][0-0]         public
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 12/  1][0/0/0][                800][0-0]                c2
+#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 18/ 12/ 13/  0][0/0/0][        2 0000 0840][0-0]                  <
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 13/ 16/  0][0/1/0][             8 0840][0-0]                   int
+#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 22/ 16/ 17/  0][0/0/0][        2 0000 0840][0-0]                      >
+#  78>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 23/ 17/ 19/  0][0/0/0][        2 0008 0800][0-0]                       ::
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 25/ 19/ 30/  0][0/0/0][                800][0-0]                         inner_class
+#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 36/ 30/ 31/  0][0/0/0][        2 0000 0840][0-0]                                    <
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 37/ 31/ 34/  0][0/1/0][             8 0840][0-0]                                     int
+#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 40/ 34/ 35/  0][0/0/0][        2 0000 0840][0-0]                                        >
+#  78>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 35/  1/  0][0/0/0][                  0][1-0]
+#  79>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0008 0400][0-0] {
+#  79>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][                400][1-0]
+#  80>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][             c 0400][0-0] public
+#  80>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][        2 0000 0400][0-0]       :
+#  80>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][                400][1-0]
+#  81>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  1/  4/  6/  0][1/1/0][             c 0400][0-0] c3
+#  81>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  3/  6/  7/  0][1/1/0][        2 0000 0500][0-0]   (
+#  81>               TYPE|               NONE|     PARENT_NOT_SET[  4/  7/ 10/  0][1/2/0][          208a 0510][0-0]    int
+#  81>               WORD|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  1][1/2/0][          2100 0510][0-0]        x
+#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 10/ 13/ 14/  1][1/2/0][        2 0000 0510][0-0]          =
+#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 12/ 15/ 16/  1][1/2/0][             8 0510][0-0]            0
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 13/ 16/ 17/  0][1/2/0][        2 0000 0510][0-0]             ,
+#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 15/ 18/ 21/  1][1/2/0][          208a 0510][0-0]               int
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][          2100 0510][0-0]                   y
+#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 21/ 24/ 25/  1][1/2/0][        2 0000 0510][0-0]                     =
+#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 23/ 26/ 27/  1][1/2/0][             8 0510][0-0]                       0
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 27/ 28/  0][1/2/0][        2 0000 0510][0-0]                        ,
+#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 26/ 29/ 32/  1][1/2/0][          208a 0510][0-0]                          int
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 33/ 34/  1][1/2/0][          2100 0510][0-0]                              z
+#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 32/ 35/ 36/  1][1/2/0][        2 0000 0510][0-0]                                =
+#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 34/ 37/ 38/  1][1/2/0][             8 0510][0-0]                                  0
+#  81>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 35/ 38/ 39/  0][1/1/0][        2 0000 0510][0-0]                                   )
+#  81>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 37/ 40/ 41/  1][1/1/0][        2 0000 0500][0-0]                                     :
+#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 39/ 42/ 45/  1][1/1/0][             c 0500][0-0]                                       m_x
+#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 42/ 45/ 46/  0][1/1/0][        2 0000 0500][0-0]                                          (
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 43/ 46/ 47/  0][1/2/0][             8 0510][0-0]                                           x
+#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 44/ 47/ 48/  0][1/1/0][        2 0000 0510][0-0]                                            )
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 48/ 49/  0][1/1/0][        2 0000 0500][0-0]                                             ,
+#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 47/ 50/ 53/  1][1/1/0][             8 0500][0-0]                                               m_y
+#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 50/ 53/ 54/  0][1/1/0][        2 0000 0500][0-0]                                                  (
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 51/ 54/ 55/  0][1/2/0][             8 0510][0-0]                                                   y
+#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 52/ 55/ 56/  0][1/1/0][        2 0000 0510][0-0]                                                    )
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 56/ 57/  0][1/1/0][        2 0000 0500][0-0]                                                     ,
+#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 55/ 58/ 61/  1][1/1/0][             8 0500][0-0]                                                       m_z
+#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 58/ 61/ 62/  0][1/1/0][        2 0000 0500][0-0]                                                          (
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 59/ 62/ 63/  0][1/2/0][             8 0510][0-0]                                                           z
+#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 60/ 63/ 64/  0][1/1/0][        2 0000 0510][0-0]                                                            )
+#  81>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 62/ 65/ 66/  1][1/1/0][        2 8000 0400][0-0]                                                              {
+#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 67/  0/  0][1/1/0][                400][1-0]
+#  81>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  1/ 67/ 68/  1][1/1/0][        2 8000 0400][0-0] }
+#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/ 68/  4/  0][1/1/0][                400][2-0]
+#  83>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][            8e 0400][0-0] int
+#  83>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][           300 0400][0-0]     m_x
+#  83>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][        2 0000 0400][0-0]        ;
+#  83>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][                400][1-0]
+#  84>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][            8e 0400][0-0] int
+#  84>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][           300 0400][0-0]     m_y
+#  84>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][        2 0000 0400][0-0]        ;
+#  84>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][                400][1-0]
+#  85>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][            8e 0400][0-0] int
+#  85>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][           300 0400][0-0]     m_z
+#  85>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][        2 0000 0400][0-0]        ;
+#  85>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][                400][1-0]
+#  86>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0400][0-0] }
+#  86>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][           70c 0000][0-0]   c31
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][        2 0000 0000][0-0]      ,
+#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][        2 0008 0000][0-0]        *
+#  86>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][          2508 0000][0-0]         c32
+#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][        2 0000 0000][0-0]             =
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][             8 0000][0-0]               nullptr
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][        2 0000 0000][0-0]                      ,
+#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][        2 0008 0000][0-0]                        *
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][           508 0000][0-0]                         c33
+#  86>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][        2 0000 0000][0-0]                            []
+#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][        2 0000 0000][0-0]                               =
+#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][        2 4008 0000][0-0]                                 {
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][          4008 0000][0-0]                                   nullptr
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][        2 4000 0000][0-0]                                          ,
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][          4008 0000][0-0]                                            nullptr
+#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][        2 4000 0000][0-0]                                                    }
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][        2 0000 0000][0-0]                                                     ,
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 55/ 55/ 58/  1][0/0/0][          2508 0000][0-0]                                                       c34
+#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/0/0][        2 4000 0000][0-0]                                                          {
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 60/ 60/ 61/  1][1/1/0][          400c 0000][0-0]                                                            0
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][1/1/0][        2 4000 0000][0-0]                                                             ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 63/ 63/ 64/  1][1/1/0][          4008 0000][0-0]                                                               1
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 64/ 64/ 65/  0][1/1/0][        2 4000 0000][0-0]                                                                ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  1][1/1/0][          4008 0000][0-0]                                                                  2
+#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][        2 4000 0000][0-0]                                                                   }
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][        2 0000 0000][0-0]                                                                    ,
+#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 70/ 70/ 71/  1][0/0/0][        2 0008 0000][0-0]                                                                      *
+#  86>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 72/ 72/ 77/  1][0/0/0][             a 0000][0-0]                                                                        const
+#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 78/ 78/ 81/  1][0/0/0][           500 0000][0-0]                                                                              c35
+#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 81/ 81/ 82/  0][0/0/0][        2 0000 0000][0-0]                                                                                 (
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 89/  0][0/1/0][             8 0010][0-0]                                                                                  nullptr
+#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 89/ 89/ 90/  0][0/0/0][        2 0000 0010][0-0]                                                                                         )
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 90/ 90/ 91/  0][0/0/0][        2 0000 0000][0-0]                                                                                          ,
+#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 92/ 92/ 95/  1][0/0/0][           508 0000][0-0]                                                                                            c16
+#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][        2 0000 0000][0-0]                                                                                               (
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 96/ 96/ 97/  0][0/1/0][             8 0010][0-0]                                                                                                0
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 97/ 97/ 98/  0][0/1/0][        2 0000 0010][0-0]                                                                                                 ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 99/ 99/100/  1][0/1/0][             8 0010][0-0]                                                                                                   1
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[100/100/101/  0][0/1/0][        2 0000 0010][0-0]                                                                                                    ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[102/102/103/  1][0/1/0][             8 0010][0-0]                                                                                                      2
+#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[103/103/104/  0][0/0/0][        2 0000 0010][0-0]                                                                                                       )
+#  86>          SEMICOLON|              CLASS|     PARENT_NOT_SET[104/104/105/  0][0/0/0][        2 0000 0000][0-0]                                                                                                        ;
+#  86>            NEWLINE|               NONE|     PARENT_NOT_SET[105/105/  1/  0][0/0/0][                  0][2-0]
+#  88>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 52/  0][0/0/0][                  0][0-0] // class/struct [macros/attributes ...] type x, ...
+#  88>            NEWLINE|               NONE|     PARENT_NOT_SET[ 52/ 52/  1/  0][0/0/0][                  0][1-0]
+#  89>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][             e 0000][0-0] class
+#  89>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[  7/  7/ 20/  1][0/0/0][                  0][0-0]       __attribute__
+#  89>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][        2 0000 0000][0-0]                    (
+#  89>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/1/0][        2 0008 0000][0-0]                     (
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 22/ 22/ 36/  0][0/2/0][             8 0000][0-0]                      __deprecated__
+#  89>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/1/0][        2 0000 0000][0-0]                                    )
+#  89>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 37/ 37/ 38/  0][0/0/0][        2 0000 0000][0-0]                                     )
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 39/ 39/ 49/  1][0/0/0][             e 0000][0-0]                                       API_EXPORT
+#  89>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][                  0][0-0]                                                  ALIGNAS
+#  89>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][        2 0000 0000][0-0]                                                         (
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][             8 0000][0-0]                                                          4
+#  89>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][        2 0000 0000][0-0]                                                           )
+#  89>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][            82 0000][0-0]                                                             c3
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 64/ 64/ 67/  1][0/0/0][           300 0000][0-0]                                                                c41
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][        2 0000 0000][0-0]                                                                   ,
+#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 69/ 69/ 70/  1][0/0/0][        2 0008 0000][0-0]                                                                     *
+#  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>               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>               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>            NEWLINE|               NONE|     PARENT_NOT_SET[178/178/  1/  0][0/0/0][                  0][2-0]
+#  91>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][                  0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
+#  91>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][                  0][1-0]
+#  92>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][             e 0000][0-0] class
+#  92>          FUNC_CALL|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/0][                  0][0-0]       ALIGNAS
+#  92>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][        2 0000 0000][0-0]              (
+#  92>             NUMBER|               NONE|     PARENT_NOT_SET[ 15/ 15/ 16/  0][0/1/0][             8 0010][0-0]               4
+#  92>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][        2 0000 0010][0-0]                )
+#  92>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 18/ 28/  1][0/0/0][             2 0000][0-0]                  API_EXPORT
+#  92>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 29/ 29/ 42/  1][0/0/0][                  0][0-0]                             __attribute__
+#  92>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][0/0/0][        2 0000 0000][0-0]                                          (
+#  92>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/1/0][        2 0008 0000][0-0]                                           (
+#  92>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 58/  0][0/2/0][             8 0000][0-0]                                            __deprecated__
+#  92>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][        2 0000 0000][0-0]                                                          )
+#  92>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][        2 0000 0000][0-0]                                                           )
+#  92>            NEWLINE|               NONE|     PARENT_NOT_SET[ 60/ 60/  1/  0][0/0/0][                  0][1-0]
+#  93>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][        2 0000 0800][0-0]         :
+#  93>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][             e 0800][0-0]           public
+#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][                800][0-0]                  outer_namespace
+#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][        2 0000 0800][0-0]                                 ::
+#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][                800][0-0]                                   inner_namespace
+#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][        2 0000 0800][0-0]                                                  ::
+#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][                800][0-0]                                                    Base1
+#  93>            NEWLINE|               NONE|     PARENT_NOT_SET[ 57/ 49/  1/  0][0/0/0][                  0][1-0]
+#  94>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0000][0-0] {
+#  94>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][                400][1-0]
+#  95>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][             c 0400][0-0] public
+#  95>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][        2 0000 0400][0-0]       :
+#  95>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][                400][1-0]
+#  96>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][            8e 0400][0-0] int
+#  96>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][           300 0400][0-0]     m_x
+#  96>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][        2 0000 0400][0-0]        ;
+#  96>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][                400][1-0]
+#  97>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][            8e 0400][0-0] int
+#  97>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][           300 0400][0-0]     m_y
+#  97>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][        2 0000 0400][0-0]        ;
+#  97>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][                400][1-0]
+#  98>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][            8e 0400][0-0] int
+#  98>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][           300 0400][0-0]     m_z
+#  98>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][        2 0000 0400][0-0]        ;
+#  98>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][                400][1-0]
+#  99>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0400][0-0] }
+#  99>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][           70c 0000][0-0]   c51
+#  99>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][        2 0000 0000][0-0]      ,
+#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][        2 0008 0000][0-0]        *
+#  99>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][          2508 0000][0-0]         c52
+#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][        2 0000 0000][0-0]             =
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][             8 0000][0-0]               nullptr
+#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][        2 0000 0000][0-0]                      ,
+#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][        2 0008 0000][0-0]                        *
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][           508 0000][0-0]                         c53
+#  99>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][        2 0000 0000][0-0]                            []
+#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][        2 0000 0000][0-0]                               =
+#  99>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][        2 4008 0000][0-0]                                 {
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][          4008 0000][0-0]                                   nullptr
+#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][        2 4000 0000][0-0]                                          ,
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][          4008 0000][0-0]                                            nullptr
+#  99>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][        2 4000 0000][0-0]                                                    }
+#  99>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][        2 0000 0000][0-0]                                                     ;
+#  99>            NEWLINE|               NONE|     PARENT_NOT_SET[ 54/ 54/  1/  0][0/0/0][                  0][3-0]
+# 102>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 44/  0][0/0/0][                  0][0-0] // enum type : integral_type { ... } x, ...
+# 102>            NEWLINE|               NONE|     PARENT_NOT_SET[ 44/ 44/  1/  0][0/0/0][                  0][1-0]
+# 103>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             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>         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]                         ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 29/  1][1/1/0][          4008 0004][0-0]                           b1
+# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 29/ 30/  0][1/1/0][        2 4000 0004][0-0]                             ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 33/  1][1/1/0][          4008 0004][0-0]                               d1
+# 103>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 34/ 34/ 35/  1][0/0/0][        2 4000 0004][0-0]                                  }
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 39/  1][0/0/0][           70c 0000][0-0]                                    e11
+# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 39/ 39/ 40/  0][0/0/0][        2 0000 0000][0-0]                                       ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 41/ 41/ 44/  1][0/0/0][           508 0000][0-0]                                         e12
+# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][        2 0000 0000][0-0]                                            ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  1][0/0/0][           508 0000][0-0]                                              e13
+# 103>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 49/ 49/ 50/  0][0/0/0][        2 0000 0000][0-0]                                                 ;
+# 103>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][                  0][2-0]
+# 105>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 37/  0][0/0/0][                  0][0-0] // enum type : integral_type { ... }
+# 105>            NEWLINE|               NONE|     PARENT_NOT_SET[ 37/ 37/  1/  0][0/0/0][                  0][1-0]
+# 106>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             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>         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]                            ,
+# 106>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 32/  1][1/1/0][          4008 0004][0-0]                              b2
+# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][1/1/0][        2 4000 0004][0-0]                                ,
+# 106>               WORD|               NONE|     PARENT_NOT_SET[ 34/ 34/ 36/  1][1/1/0][          4008 0004][0-0]                                  d2
+# 106>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 37/ 37/ 38/  1][0/0/0][        2 4000 0004][0-0]                                     }
+# 106>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 38/ 38/ 39/  0][0/0/0][        2 0000 0000][0-0]                                      ;
+# 106>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][                  0][2-0]
+# 108>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 29/  0][0/0/0][                  0][0-0] // enum type : integral_type
+# 108>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 29/  1/  0][0/0/0][                  0][1-0]
+# 109>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][     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>          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, ...
+# 111>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][                  0][1-0]
+# 112>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             e 0000][0-0] enum
+# 112>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][            82 0000][0-0]      e3
+# 112>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  1][0/0/0][           300 0000][0-0]         e31
+# 112>              COMMA|               NONE|     PARENT_NOT_SET[ 12/ 12/ 13/  0][0/0/0][        2 0000 0000][0-0]            ,
+# 112>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 17/  1][0/0/0][           108 0000][0-0]              e32
+# 112>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 17/ 17/ 18/  0][0/0/0][        2 0000 0000][0-0]                 ;
+# 112>            NEWLINE|               NONE|     PARENT_NOT_SET[ 18/ 18/  1/  0][0/0/0][                  0][2-0]
+# 114>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 50/  0][0/0/0][                  0][0-0] // enum class type : integral_type { ... } x, ...
+# 114>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][                  0][1-0]
+# 115>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             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>         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]                               ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 35/  1][1/1/0][          4008 0004][0-0]                                 b4
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/1/0][        2 4000 0004][0-0]                                   ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 39/  1][1/1/0][          4008 0004][0-0]                                     d4
+# 115>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 40/ 40/ 41/  1][0/0/0][        2 4000 0004][0-0]                                        }
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 42/ 42/ 45/  1][0/0/0][           70c 0000][0-0]                                          e41
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 45/ 46/  0][0/0/0][        2 0000 0000][0-0]                                             ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 47/ 47/ 50/  1][0/0/0][           508 0000][0-0]                                               e42
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  0][0/0/0][        2 0000 0000][0-0]                                                  ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 55/  1][0/0/0][           508 0000][0-0]                                                    e43
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 55/ 55/ 56/  0][0/0/0][        2 0000 0000][0-0]                                                       ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 57/ 57/ 60/  1][0/0/0][           508 0000][0-0]                                                         e44
+# 115>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 60/ 60/ 61/  0][0/0/0][        2 0000 0000][0-0]                                                            ;
+# 115>            NEWLINE|               NONE|     PARENT_NOT_SET[ 61/ 61/  1/  0][0/0/0][                  0][2-0]
+# 117>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 43/  0][0/0/0][                  0][0-0] // enum class type : integral_type { ... }
+# 117>            NEWLINE|               NONE|     PARENT_NOT_SET[ 43/ 43/  1/  0][0/0/0][                  0][1-0]
+# 118>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             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>         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]                                  ,
+# 118>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 38/  1][1/1/0][          4008 0004][0-0]                                    b5
+# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 38/ 38/ 39/  0][1/1/0][        2 4000 0004][0-0]                                      ,
+# 118>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 42/  1][1/1/0][          4008 0004][0-0]                                        d5
+# 118>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 43/ 43/ 44/  1][0/0/0][        2 4000 0004][0-0]                                           }
+# 118>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][        2 0000 0000][0-0]                                            ;
+# 118>            NEWLINE|               NONE|     PARENT_NOT_SET[ 45/ 45/  1/  0][0/0/0][                  0][2-0]
+# 120>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 35/  0][0/0/0][                  0][0-0] // enum class type : integral_type
+# 120>            NEWLINE|               NONE|     PARENT_NOT_SET[ 35/ 35/  1/  0][0/0/0][                  0][1-0]
+# 121>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][     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>          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
+# 123>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/0][                  0][1-0]
+# 124>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][     1000 000e 0000][0-0] enum
+# 124>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][     1000 0002 0000][0-0]      class
+# 124>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][     1000 0000 0000][0-0]            e7
+# 124>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][        2 0000 0000][0-0]              ;
+# 124>            NEWLINE|               NONE|     PARENT_NOT_SET[ 15/ 15/  1/  0][0/0/0][                  0][2-0]
+# 126>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 39/  0][0/0/0][                  0][0-0] // enum : integral_type { ... } x, ...
+# 126>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][                  0][1-0]
+# 127>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             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>         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]                      ,
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][1/1/0][          4008 0004][0-0]                        b8
+# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 26/ 26/ 27/  0][1/1/0][        2 4000 0004][0-0]                          ,
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  1][1/1/0][          4008 0004][0-0]                            c8
+# 127>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][        2 4000 0004][0-0]                               }
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 36/  1][0/0/0][           70c 0000][0-0]                                 e81
+# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/0/0][        2 0000 0000][0-0]                                    ,
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 38/ 38/ 41/  1][0/0/0][           508 0000][0-0]                                      e82
+# 127>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 41/ 41/ 42/  0][0/0/0][        2 0000 0000][0-0]                                         ;
+# 127>            NEWLINE|               NONE|     PARENT_NOT_SET[ 42/ 42/  1/  0][0/0/0][                  0][2-0]
+# 129>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 23/  0][0/0/0][                  0][0-0] // enum { ... } x, ...
+# 129>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][                  0][1-0]
+# 130>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             c 0000][0-0] enum
+# 130>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][        2 4000 0000][0-0]      {
+# 130>               WORD|               NONE|     PARENT_NOT_SET[  8/  8/ 10/  1][1/1/0][          400c 0004][0-0]        a9
+# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][1/1/0][        2 4000 0004][0-0]          ,
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 12/ 12/ 14/  1][1/1/0][          4008 0004][0-0]            b9
+# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 14/ 14/ 15/  0][1/1/0][        2 4000 0004][0-0]              ,
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 16/ 16/ 18/  1][1/1/0][          4008 0004][0-0]                c9
+# 130>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 19/ 19/ 20/  1][0/0/0][        2 4000 0004][0-0]                   }
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][           70c 0000][0-0]                     e91
+# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][        2 0000 0000][0-0]                        ,
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][           508 0000][0-0]                          e92
+# 130>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 29/ 29/ 30/  0][0/0/0][        2 0000 0000][0-0]                             ;
+# 130>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 30/  1/  0][0/0/0][                  0][2-0]
+# 132>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][             e 0000][0-0] union
+# 132>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][             2 0000][0-0]       API_EXPORT
+# 132>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][            80 0000][0-0]                  u1
+# 132>         BRACE_OPEN|              UNION|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][        2 4000 0000][0-0]                     {
+# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 23/ 23/ 26/  1][1/1/0][          408e 0000][0-0]                       int
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][1/1/0][          4300 0000][0-0]                           x
+# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][        2 4000 0000][0-0]                            ;
+# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 30/ 30/ 34/  1][1/1/0][          408e 0000][0-0]                              long
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  1][1/1/0][          4300 0000][0-0]                                   y
+# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][1/1/0][        2 4000 0000][0-0]                                    ;
+# 132>        BRACE_CLOSE|              UNION|     PARENT_NOT_SET[ 38/ 38/ 39/  1][0/0/0][        2 4000 0000][0-0]                                      }
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 43/  1][0/0/0][           70c 0000][0-0]                                        u11
+# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][        2 0000 0000][0-0]                                           ,
+# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 45/ 45/ 46/  1][0/0/0][        2 0008 0000][0-0]                                             *
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  0][0/0/0][          2508 0000][0-0]                                              u12
+# 132>             ASSIGN|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  1][0/0/0][        2 0000 0000][0-0]                                                  =
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 59/  1][0/0/0][             8 0000][0-0]                                                    nullptr
+# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][        2 0000 0000][0-0]                                                           ,
+# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 61/ 61/ 62/  1][0/0/0][        2 0008 0000][0-0]                                                             *
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/0/0][          2508 0000][0-0]                                                              u13
+# 132>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][        2 4000 0000][0-0]                                                                 {
+# 132>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  0][1/1/0][          400c 0000][0-0]                                                                  0
+# 132>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][        2 4000 0000][0-0]                                                                   }
+# 132>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][        2 0000 0000][0-0]                                                                    ;
+# 132>            NEWLINE|               NONE|     PARENT_NOT_SET[ 69/ 69/  1/  0][0/0/0][                  0][2-0]
+# 134>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][             e 0000][0-0] union
+# 134>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][             2 0000][0-0]       API_EXPORT
+# 134>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][            82 0000][0-0]                  u1
+# 134>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][           300 0000][0-0]                     u21
+# 134>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][        2 0000 0000][0-0]                        ;
+# 134>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 25/  1/  0][0/0/0][                  0][1-0]
+# -=====-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/copyright-header.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/copyright-header.cpp
index 348902a5..348902a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/copyright-header.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/copyright-header.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/help.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/help.txt
index ff83f72b..f6c25116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/help.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/help.txt
@@ -61,7 +61,8 @@ 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 tracking informations for debugging.
+ --tracking_space FILE : Prepare space tracking information for debugging.
+ --tracking_nl FILE    : Prepare newline tracking information for debugging.
                          Cannot be used with the -o option'
 
 Usage Examples
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.76.0/tests/cli/output/logger_cs_L_99.txt
new file mode 100644
index 00000000..44abdcfd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/logger_cs_L_99.txt
@@ -0,0 +1,8 @@
+tokenize(): orig line is , orig col is , Text() '// Turning on sp_inside_braces=add fixes it, but also changes a lot of initializer code we don't want to touch (like x = {}). May need special support, or perhaps there's a bug..', type is COMMENT_CPP, orig col end is 
+tokenize(): orig line is , orig col is , <Newline>, nl is 
+tokenize(): orig line is , orig col is , Text() '// long comment line(s), such as here, might be too long to produce a correct LOG-file such as', type is COMMENT_CPP, orig col end is 
+tokenize(): orig line is , orig col is , <Newline>, nl is 
+tokenize(): orig line is , orig col is , Text() '// with the use of option -L A', type is COMMENT_CPP, orig col end is 
+tokenize(): orig line is , orig col is , <Newline>, nl is 
+tokenize(): orig line is , orig col is , Text() '// in such a case, the output of the log will be cut.', type is COMMENT_CPP, orig col end is 
+tokenize(): orig line is , orig col is , <Newline>, nl is 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/p.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/p.txt
new file mode 100644
index 00000000..616c7066
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/p.txt
@@ -0,0 +1,148 @@
+

+newlines                        = crlf

+debug_decode_the_flags          = true

+# option(s) with 'not default' value: 2

+#

+# -=====-

+# number of loops               = 0
+# -=====-

+# language                      = CPP
+# -=====-

+# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp             Flags   Nl  Text

+#   1>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][        2 001c 0001][0-0] #

+         The flags are: [0x2001c0001:IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR]

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

+         The flags are: [0x20001:IN_PREPROC,FORCE_SPACE]

+#   1>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 10/  1][1/1/0][             2 0001][0-0]         x

+         The flags are: [0x20001:IN_PREPROC,FORCE_SPACE]

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

+         The flags are: [0xc0001:IN_PREPROC,STMT_START,EXPR_START]

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

+         The flags are: [0x200000001:IN_PREPROC,PUNCTUATOR]

+#   1>            NL_CONT|               NONE|     PARENT_NOT_SET[ 22/ 22/  1/  1][1/1/0][             8 0001][1-0]                      \

+         The flags are: [0x80001:IN_PREPROC,EXPR_START]

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

+         The flags are: [0x80001:IN_PREPROC,EXPR_START]

+#   2>              ARITH|               NONE|     PARENT_NOT_SET[ 16/  8/  9/  1][1/1/0][        2 0000 0001][0-0]                *

+         The flags are: [0x200000001:IN_PREPROC,PUNCTUATOR]

+#   2>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 10/ 17/  1][1/1/0][             8 0001][0-0]                  s16_bar

+         The flags are: [0x80001:IN_PREPROC,EXPR_START]

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

+         The flags are: [0x200000001:IN_PREPROC,PUNCTUATOR]

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

+         The flags are: [0x0:]

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

+         The flags are: [0xe0000:FORCE_SPACE,STMT_START,EXPR_START]

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

+         The flags are: [0x0:]

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

+         The flags are: [0x0:]

+#   5>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0400][0-0] {

+         The flags are: [0x200000400:IN_CLASS,PUNCTUATOR]

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

+         The flags are: [0x2:IN_STRUCT]

+#   6>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  9/  1/ 14/  0][1/1/0][             c 0402][0-0]         TelegramIndex

+         The flags are: [0xc0402:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START]

+#   6>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 22/ 14/ 15/  0][1/1/0][        2 0000 0502][0-0]                      (

+         The flags are: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   6>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 23/ 15/ 20/  0][1/2/0][             a 0512][0-0]                       const

+         The flags are: [0xa0512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START]

+#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 29/ 21/ 25/  1][1/2/0][            80 0512][0-0]                             char

+         The flags are: [0x800512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_TYPE]

+#   6>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 33/ 25/ 26/  0][1/2/0][        2 0000 0512][0-0]                                 *

+         The flags are: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   6>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 27/ 29/  1][1/2/0][           100 0512][0-0]                                   pN

+         The flags are: [0x1000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF]

+#   6>              COMMA|               NONE|     PARENT_NOT_SET[ 37/ 29/ 30/  0][1/2/0][        2 0000 0512][0-0]                                     ,

+         The flags are: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 39/ 31/ 39/  1][1/2/0][            8a 0512][0-0]                                       unsigned

+         The flags are: [0x8a0512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE]

+#   6>               TYPE|               NONE|     PARENT_NOT_SET[ 48/ 40/ 44/  1][1/2/0][            82 0512][0-0]                                                long

+         The flags are: [0x820512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,VAR_TYPE]

+#   6>               WORD|               NONE|     PARENT_NOT_SET[ 53/ 45/ 47/  1][1/2/0][           100 0512][0-0]                                                     nI

+         The flags are: [0x1000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF]

+#   6>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 55/ 47/ 48/  0][1/1/0][        2 0000 0512][0-0]                                                       )

+         The flags are: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   6>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  1][1/1/0][        2 0000 0502][0-0]                                                         :

+         The flags are: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   6>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  1/  0][1/1/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#   7>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 17/  1/  9/  0][1/1/0][             c 0502][0-0]                 pTelName

+         The flags are: [0xc0502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START]

+#   7>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 25/  9/ 10/  0][1/1/0][        2 0000 0502][0-0]                         (

+         The flags are: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   7>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 10/ 12/  0][1/2/0][             8 0512][0-0]                          pN

+         The flags are: [0x80512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START]

+#   7>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 28/ 12/ 13/  0][1/1/0][        2 0000 0512][0-0]                            )

+         The flags are: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   7>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 13/ 14/  0][1/1/0][        2 0000 0502][0-0]                             ,

+         The flags are: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   7>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 14/  1/  0][1/1/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#   8>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 17/  1/ 10/  0][1/1/0][             8 0502][0-0]                 nTelIndex

+         The flags are: [0x80502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,EXPR_START]

+#   8>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 26/ 10/ 11/  0][1/1/0][        2 0000 0502][0-0]                          (

+         The flags are: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   8>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 11/ 12/  0][1/2/0][             8 0512][0-0]                           n

+         The flags are: [0x80512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START]

+#   8>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 28/ 12/ 13/  0][1/1/0][        2 0000 0512][0-0]                            )

+         The flags are: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#   8>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 13/  1/  0][1/1/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#   9>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][        2 8000 0402][0-0]         {

+         The flags are: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]

+#   9>            NEWLINE|               NONE|     PARENT_NOT_SET[ 10/  2/  1/  0][2/2/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#  10>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][        2 8000 0402][0-0]         }

+         The flags are: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]

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

+         The flags are: [0x2:IN_STRUCT]

+#  12>         DESTRUCTOR|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][        2 000c 0402][0-0]         ~

+         The flags are: [0x2000c0402:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START,PUNCTUATOR]

+#  12>     FUNC_CLASS_DEF|         DESTRUCTOR|     PARENT_NOT_SET[ 10/  2/ 15/  0][1/1/0][             8 0402][0-0]          TelegramIndex

+         The flags are: [0x80402:IN_STRUCT,IN_CLASS,EXPR_START]

+#  12>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 23/ 15/ 16/  0][1/1/0][        2 0000 0502][0-0]                       (

+         The flags are: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#  12>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 24/ 16/ 17/  0][1/1/0][        2 0000 0512][0-0]                        )

+         The flags are: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]

+#  12>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 17/  1/  0][1/1/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#  13>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][        2 8000 0402][0-0]         {

+         The flags are: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]

+#  13>            NEWLINE|               NONE|     PARENT_NOT_SET[ 10/  2/  1/  0][2/2/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#  14>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  9/  1/  2/  0][1/1/0][        2 8000 0402][0-0]         }

+         The flags are: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]

+#  14>            NEWLINE|               NONE|     PARENT_NOT_SET[ 10/  2/  1/  0][1/1/0][                  2][2-0]

+         The flags are: [0x2:IN_STRUCT]

+#  16>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  1/  6/  0][1/1/0][            8e 0402][0-0]         const

+         The flags are: [0x8e0402:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE]

+#  16>               TYPE|               NONE|     PARENT_NOT_SET[ 15/  7/ 11/  1][1/1/0][            80 0402][0-0]               char

+         The flags are: [0x800402:IN_STRUCT,IN_CLASS,VAR_TYPE]

+#  16>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 19/ 11/ 12/  0][1/1/0][        2 0080 0402][0-0]                   *

+         The flags are: [0x200800402:IN_STRUCT,IN_CLASS,VAR_TYPE,PUNCTUATOR]

+#  16>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 21/ 13/ 18/  1][1/1/0][            82 0402][0-0]                     const

+         The flags are: [0x820402:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE]

+#  16>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 19/ 27/  1][1/1/0][           300 0402][0-0]                           pTelName

+         The flags are: [0x3000402:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_1ST]

+#  16>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 35/ 27/ 28/  0][1/1/0][        2 0000 0402][0-0]                                   ;

+         The flags are: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]

+#  16>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 28/  1/  0][1/1/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#  17>               TYPE|               NONE|     PARENT_NOT_SET[  9/  1/  9/  0][1/1/0][            8e 0402][0-0]         unsigned

+         The flags are: [0x8e0402:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE]

+#  17>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 14/  1][1/1/0][            82 0402][0-0]                  long

+         The flags are: [0x820402:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE]

+#  17>               WORD|               NONE|     PARENT_NOT_SET[ 23/ 15/ 24/  1][1/1/0][           300 0402][0-0]                       nTelIndex

+         The flags are: [0x3000402:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_1ST]

+#  17>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 32/ 24/ 25/  0][1/1/0][        2 0000 0402][0-0]                                ;

+         The flags are: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]

+#  17>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 25/  1/  0][1/1/0][                  2][1-0]

+         The flags are: [0x2:IN_STRUCT]

+#  18>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][        2 0000 0402][0-0] }

+         The flags are: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]

+#  18>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][        2 0000 0000][0-0]  ;

+         The flags are: [0x200000000:PUNCTUATOR]

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

+         The flags are: [0x0:]

+# -=====-

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/pc-.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/pc-.txt
index 2b7e9280..aa0e221e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/pc-.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/pc-.txt
@@ -6,5 +6,5 @@
 # -=====-
 # language                      = C
 # -=====-
-# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp         Flag   Nl  Text
+# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp             Flags   Nl  Text
 # -=====-
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
new file mode 100644
index 00000000..91bffadc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/replace.txt
@@ -0,0 +1,2 @@
+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.75.0/tests/cli/output/tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/tracking_space.html
index b0098a0e..b0098a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/tracking_space.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/tracking_space.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/truncate.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/truncate.txt
index ab5bb332..3b63da09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/truncate.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/truncate.txt
@@ -1,16 +1,16 @@
-output_text : Text() is '// 1 6789A123456789B123456789c12345678 ... <The string is truncated>', type is COMMENT_CPP, orig_line is 1, column is 1, nl is 0
+output_text : Text() is '// 1 6789A123456789B123456789c12345678 ... <The string is truncated>', type is COMMENT_CPP, orig line is 1, column is 1, nl is 0
 output_cmt_start : no cmt_insert_file
 output_comment_cpp : set cont_text to '// '
-output_text : Text() is '', type is NEWLINE, orig_line is 1, column is 74, nl is 1
-output_text : Text() is '// 2 678 ... <The string is truncated>', type is COMMENT_CPP, orig_line is 2, column is 1, nl is 0
+output_text : Text() is '', type is NEWLINE, orig line is 1, column is 74, nl is 1
+output_text : Text() is '// 2 678 ... <The string is truncated>', type is COMMENT_CPP, orig line is 2, column is 1, nl is 0
 output_cmt_start : no cmt_insert_file
 output_comment_cpp : set cont_text to '// '
-output_text : Text() is '', type is NEWLINE, orig_line is 2, column is 40, nl is 1
-output_text : Text() is '// 3 6789A123456789B123456789c12345678', type is COMMENT_CPP, orig_line is 3, column is 1, nl is 0
+output_text : Text() is '', type is NEWLINE, orig line is 2, column is 40, nl is 1
+output_text : Text() is '// 3 6789A123456789B123456789c12345678', type is COMMENT_CPP, orig line is 3, column is 1, nl is 0
 output_cmt_start : no cmt_insert_file
 output_comment_cpp : set cont_text to '// '
-output_text : Text() is '', type is NEWLINE, orig_line is 3, column is 39, nl is 1
-output_text : Text() is '// 4 6789A123456789B123456789c1234567', type is COMMENT_CPP, orig_line is 4, column is 1, nl is 0
+output_text : Text() is '', type is NEWLINE, orig line is 3, column is 39, nl is 1
+output_text : Text() is '// 4 6789A123456789B123456789c1234567', type is COMMENT_CPP, orig line is 4, column is 1, nl is 0
 output_cmt_start : no cmt_insert_file
 output_comment_cpp : set cont_text to '// '
-output_text : Text() is '', type is NEWLINE, orig_line is 4, column is 38, nl is 1
+output_text : Text() is '', type is NEWLINE, orig line is 4, column is 38, nl is 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/universalindent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/universalindent.cfg
index 722ba239..4d7457be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/universalindent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/universalindent.cfg
@@ -1002,7 +1002,7 @@ ValueDefault=remove
 
 [Sp After Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</html>"
+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
@@ -1011,7 +1011,7 @@ ValueDefault=ignore
 
 [Sp Before Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
+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
@@ -1020,7 +1020,7 @@ ValueDefault=ignore
 
 [Sp Between Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
+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
@@ -2269,7 +2269,7 @@ ValueDefault=ignore
 
 [Sp Inside Newop Paren]
 Category=1
-Description="<html>Add or remove space inside parenthesis of the new operator<br/>as in 'new(foo) BAR'.</html>"
+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
@@ -3339,7 +3339,7 @@ ValueDefault=true
 
 [Indent Ternary Operator]
 Category=2
-Description="<html>How to indent the continuation of ternary operator.<br/><br/>0: Off (default)<br/>1: When the `if_false` is a continuation, indent it under `if_false`<br/>2: When the `:` is a continuation, indent it under `?`</html>"
+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="
@@ -3397,12 +3397,20 @@ ValueDefault=false
 
 [Nl Collapse Empty Body]
 Category=3
-Description="<html>Whether to collapse empty blocks between '{' and '}'.<br/>If true, overrides nl_inside_empty_func</html>"
+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
 ValueDefault=false
 
+[Nl Collapse Empty Body Functions]
+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
+ValueDefault=false
+
 [Nl Assign Leave One Liners]
 Category=3
 Description="<html>Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.</html>"
@@ -4536,6 +4544,26 @@ EditorType=boolean
 TrueFalse=nl_oc_msg_args=true|nl_oc_msg_args=false
 ValueDefault=false
 
+[Nl Oc Msg Args Min Params]
+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="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Oc Msg Args Max Code Width]
+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="
+MinVal=0
+MaxVal=10000
+ValueDefault=0
+
 [Nl Fdef Brace]
 Category=3
 Description="<html>Add or remove newline between function signature and '{'.</html>"
@@ -4572,6 +4600,15 @@ Choices=nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return
 ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
 ValueDefault=ignore
 
+[Nl Throw Expr]
+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
+ChoicesReadable="Ignore Nl Throw Expr|Add Nl Throw Expr|Remove Nl Throw Expr|Force Nl Throw Expr"
+ValueDefault=ignore
+
 [Nl After Semicolon]
 Category=3
 Description="<html>Whether to add a newline after semicolons, except in 'for' statements.</html>"
@@ -4999,7 +5036,7 @@ ValueDefault=0
 
 [Nl Inside Empty Func]
 Category=4
-Description="<html>The number of newlines inside an empty function body.<br/>This option overrides eat_blanks_after_open_brace and<br/>eat_blanks_before_close_brace, but is ignored when<br/>nl_collapse_empty_body=true</html>"
+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="
@@ -5125,16 +5162,6 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl Func Var Def Blk]
-Category=4
-Description="<html>The number of blank lines after a block of variable definitions at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_func_var_def_blk="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
 [Nl Typedef Blk Start]
 Category=4
 Description="<html>The number of newlines before a block of typedefs. If nl_after_access_spec<br/>is non-zero, that option takes precedence.<br/><br/>0: No change (default).</html>"
@@ -5165,9 +5192,19 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
+[Nl Var Def Blk End Func Top]
+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="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
 [Nl Var Def Blk Start]
 Category=4
-Description="<html>The 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.<br/><br/>0: No change (default).</html>"
+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="
@@ -5177,7 +5214,7 @@ ValueDefault=0
 
 [Nl Var Def Blk End]
 Category=4
-Description="<html>The number of empty newlines after a block of variable definitions<br/>not at the top of a function body.<br/><br/>0: No change (default).</html>"
+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="
@@ -5836,16 +5873,6 @@ MinVal=0
 MaxVal=5000
 ValueDefault=0
 
-[Align Braced Init List Span]
-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="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
 [Align Assign Func Proto Span]
 Category=7
 Description="<html>The span for aligning on '=' in function prototype modifier.<br/><br/>0: Don't align (default).</html>"
@@ -5874,6 +5901,16 @@ EditorType=boolean
 TrueFalse=align_assign_on_multi_var_defs=true|align_assign_on_multi_var_defs=false
 ValueDefault=false
 
+[Align Braced Init List Span]
+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="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
 [Align Braced Init List Thresh]
 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>"
@@ -6612,13 +6649,22 @@ ValueDefault=false
 
 [Mod Paren On Return]
 Category=9
-Description="<html>Add or remove unnecessary parenthesis on 'return' statement.</html>"
+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
 ChoicesReadable="Ignore Mod Paren On Return|Add Mod Paren On Return|Remove Mod Paren On Return|Force Mod Paren On Return"
 ValueDefault=ignore
 
+[Mod Paren On Throw]
+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
+ChoicesReadable="Ignore Mod Paren On Throw|Add Mod Paren On Throw|Remove Mod Paren On Throw|Force Mod Paren On Throw"
+ValueDefault=ignore
+
 [Mod Pawn Semicolon]
 Category=9
 Description="<html>(Pawn) Whether to change optional semicolons to real semicolons.</html>"
@@ -6841,6 +6887,96 @@ Choices=mod_enum_last_comma=ignore|mod_enum_last_comma=add|mod_enum_last_comma=r
 ChoicesReadable="Ignore Mod Enum Last Comma|Add Mod Enum Last Comma|Remove Mod Enum Last Comma|Force Mod Enum Last Comma"
 ValueDefault=ignore
 
+[Mod Infinite Loop]
+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="
+MinVal=0
+MaxVal=5
+ValueDefault=0
+
+[Mod Int Short]
+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
+ChoicesReadable="Ignore Mod Int Short|Add Mod Int Short|Remove Mod Int Short|Force Mod Int Short"
+ValueDefault=ignore
+
+[Mod Short Int]
+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
+ChoicesReadable="Ignore Mod Short Int|Add Mod Short Int|Remove Mod Short Int|Force Mod Short Int"
+ValueDefault=ignore
+
+[Mod Int Long]
+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
+ChoicesReadable="Ignore Mod Int Long|Add Mod Int Long|Remove Mod Int Long|Force Mod Int Long"
+ValueDefault=ignore
+
+[Mod Long Int]
+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
+ChoicesReadable="Ignore Mod Long Int|Add Mod Long Int|Remove Mod Long Int|Force Mod Long Int"
+ValueDefault=ignore
+
+[Mod Int Signed]
+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
+ChoicesReadable="Ignore Mod Int Signed|Add Mod Int Signed|Remove Mod Int Signed|Force Mod Int Signed"
+ValueDefault=ignore
+
+[Mod Signed Int]
+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
+ChoicesReadable="Ignore Mod Signed Int|Add Mod Signed Int|Remove Mod Signed Int|Force Mod Signed Int"
+ValueDefault=ignore
+
+[Mod Int Unsigned]
+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
+ChoicesReadable="Ignore Mod Int Unsigned|Add Mod Int Unsigned|Remove Mod Int Unsigned|Force Mod Int Unsigned"
+ValueDefault=ignore
+
+[Mod Unsigned Int]
+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
+ChoicesReadable="Ignore Mod Unsigned Int|Add Mod Unsigned Int|Remove Mod Unsigned Int|Force Mod Unsigned Int"
+ValueDefault=ignore
+
+[Mod Int Prefer Int On Left]
+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
+ValueDefault=false
+
 [Mod Sort Oc Properties]
 Category=9
 Description="<html>(OC) Whether to organize the properties. If true, properties will be<br/>rearranged according to the mod_sort_oc_property_*_weight factors.</html>"
@@ -6919,6 +7055,16 @@ MinVal=
 MaxVal=
 ValueDefault=0
 
+[Pp Indent With Tabs]
+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="
+MinVal=-1
+MaxVal=2
+ValueDefault=-1
+
 [Pp Indent]
 Category=10
 Description="<html>Add or remove indentation of preprocessor directives inside #if blocks<br/>at brace level 0 (file-level).</html>"
@@ -6954,18 +7100,18 @@ MinVal=0
 MaxVal=16
 ValueDefault=1
 
-[Pp Space]
+[Pp Space After]
 Category=10
-Description="<html>Add or remove space after # based on pp_level of #if blocks.</html>"
+Description="<html>Add or remove space after # based on pp level of #if blocks.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force|pp_space=not_defined
-ChoicesReadable="Ignore Pp Space|Add Pp Space|Remove Pp Space|Force Pp Space"
+Choices=pp_space_after=ignore|pp_space_after=add|pp_space_after=remove|pp_space_after=force|pp_space_after=not_defined
+ChoicesReadable="Ignore Pp Space After|Add Pp Space After|Remove Pp Space After|Force Pp Space After"
 ValueDefault=ignore
 
 [Pp Space Count]
 Category=10
-Description="<html>Sets the number of spaces per level added with pp_space.</html>"
+Description="<html>Sets the number of spaces per level added with pp_space_after.</html>"
 Enabled=false
 EditorType=numeric
 CallName="pp_space_count="
@@ -7041,9 +7187,19 @@ EditorType=boolean
 TrueFalse=pp_ignore_define_body=true|pp_ignore_define_body=false
 ValueDefault=false
 
+[Pp Multiline Define Body Indent]
+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="
+MinVal=-32
+MaxVal=32
+ValueDefault=8
+
 [Pp Indent Case]
 Category=10
-Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the case statements<br/>directly inside of.<br/><br/>Default: true</html>"
+Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the 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
@@ -7051,7 +7207,7 @@ ValueDefault=true
 
 [Pp Indent Func Def]
 Category=10
-Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the function definition<br/>is directly inside of.<br/><br/>Default: true</html>"
+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
@@ -7059,7 +7215,7 @@ ValueDefault=true
 
 [Pp Indent Extern]
 Category=10
-Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the extern block is<br/>directly inside of.<br/><br/>Default: true</html>"
+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
@@ -7067,7 +7223,7 @@ ValueDefault=true
 
 [Pp Indent Brace]
 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/>preprocesser 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>"
+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="
@@ -7125,7 +7281,7 @@ ValueDefault=false
 
 [Indent Cpp Lambda Only Once]
 Category=12
-Description="<html>The indentation can be:<br/>- after the assignment, at the '[' character<br/>- at the begin of the lambda body<br/><br/>true:  indentation will be after the assignment<br/>false: indentation will be at the begin of the lambda body (default)</html>"
+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
@@ -7204,3 +7360,27 @@ CallName="debug_truncate="
 MinVal=0
 MaxVal=960
 ValueDefault=0
+
+[Debug Sort The Tracks]
+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
+ValueDefault=true
+
+[Debug Decode The Flags]
+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
+ValueDefault=false
+
+[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
+ValueDefault=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/unmatched_close_pp.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/unmatched_close_pp.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/unmatched_close_pp.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/unmatched_close_pp.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/v-out.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/v-out.txt
index 129af768..129af768 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/v-out.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/v-out.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/xyz-err.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/xyz-err.txt
index a16550ed..a16550ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/xyz-err.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/xyz-err.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/test_cli_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/test_cli_options.py
index 69c1c620..06b658bc 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/test_cli_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/test_cli_options.py
@@ -713,30 +713,32 @@ def main(args):
     #
     # Test --tracking_space FILE
     #
-    if parsed_args.config == 'Debug':
-        eprint("Debug")
-        if not check_uncrustify_output(
-                uncr_bin,
-                parsed_args,
-                args_arr=['-c', s_path_join(script_dir, 'config/tracking_space.cfg'),
-                          '-f', s_path_join(script_dir, 'input/tracking_space.cpp'),
-                          '--tracking_space', s_path_join(test_dir, 'results/Debug_tracking_space.html')],
-                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'),
-                ):
-            return_flag = False
+    if os_name != 'nt':
+        # &lt; &gt; doesn't work under windows
+        if parsed_args.config == 'Debug':
+            eprint("Debug")
+            if not check_uncrustify_output(
+                    uncr_bin,
+                    parsed_args,
+                    args_arr=['-c', s_path_join(script_dir, 'config/tracking_space.cfg'),
+                              '-f', s_path_join(script_dir, 'input/tracking_space.cpp'),
+                              '--tracking_space', s_path_join(test_dir, 'results/Debug_tracking_space.html')],
+                    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'),
+                    ):
+                return_flag = False
 
     #
     # Test --replace
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1225.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1225.cfg
index cbc83adb..cbc83adb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1225.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1225.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-no-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-no-split.cfg
index 84eba64d..84eba64d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-no-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-no-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-split.cfg
index e666ea24..e666ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue-2278.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue-2278.cfg
index 80ba4f6f..80ba4f6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue-2278.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue-2278.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2279.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2279.cfg
index 1f646668..1f646668 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2279.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2279.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-a.cfg
index 85052020..85052020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-b.cfg
index b61841cc..b61841cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2411.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2411.cfg
index a4770ec9..a4770ec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2411.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2411.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2640.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2640.cfg
index a4dd2354..a4dd2354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2640.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2640.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3169.cfg
index 9feaa3d8..ae9fa1f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3169.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3169.cfg
@@ -1,4 +1,5 @@
 sp_pp_concat       = ignore
 indent_columns     = 2
+pp_multiline_define_body_indent = 2
 align_var_def_span = 1
 align_nl_cont      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3233.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3233.cfg
index 71ee918b..71ee918b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3233.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3233.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3269.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3269.cfg
index 3a4bb6bf..3a4bb6bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3269.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3269.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3272.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3272.cfg
index 2cda9402..2cda9402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3272.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3272.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3274.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3274.cfg
index 63aa1d0c..63aa1d0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3274.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3274.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3327.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3327.cfg
index 1470c6b5..1470c6b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3327.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3327.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3350.cfg
index d53c8094..d53c8094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3350.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3350.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3351.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3351.cfg
index 67df4d20..67df4d20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3351.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3351.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3353.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3353.cfg
index 56810833..56810833 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3353.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3353.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3356.cfg
index 2791f6c6..2791f6c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3356.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3356.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3370.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3370.cfg
index 05f38590..05f38590 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3370.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3370.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3377.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3377.cfg
index ca7a07db..ca7a07db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3377.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3377.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3402.cfg
index 5252c78d..5252c78d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3431.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3431.cfg
index 45dbff25..45dbff25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3431.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3431.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3454.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3454.cfg
index 9674606a..9674606a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3454.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3454.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3457.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3457.cfg
index 78984566..78984566 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3457.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3457.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3472.cfg
index 9e1acf21..9e1acf21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3472.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3472.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3476.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3476.cfg
index 3fef0a75..3fef0a75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3476.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3476.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3480.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3480.cfg
index d86880ad..d86880ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3480.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3480.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3493.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3493.cfg
index cfc36660..cfc36660 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3493.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3493.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3506.cfg
index 6a9f2d25..6a9f2d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2570.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3506.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3516.cfg
index ba1f9656..ba1f9656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3516.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3516.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3517.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3517.cfg
index ed31649e..ed31649e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3517.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/Issue_3518.cfg
new file mode 100644
index 00000000..a7caf986
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3518.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_end_func_top = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3556.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3556.cfg
index 9840c82d..9840c82d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3556.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3556.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3561.cfg
index 56965ae8..56965ae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3561.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3561.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3565.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3565.cfg
index c1a793e8..c1a793e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3565.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3565.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3567-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-a.cfg
index 1659f46a..1659f46a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3567-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3567-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-b.cfg
index 454bc264..454bc264 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3567-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3580.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3580.cfg
index fc53aac2..fc53aac2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3580.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3580.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3582.cfg
index d6b1a287..d6b1a287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3582.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3582.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3601.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3601.cfg
index 3537fd11..3537fd11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3601.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/Issue_3662.cfg
new file mode 100644
index 00000000..6500adbb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3662.cfg
@@ -0,0 +1,4 @@
+sp_before_ptr_star = remove
+sp_before_byref    = remove
+sp_after_ptr_star  = add
+sp_after_byref     = add
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.76.0/tests/config/c/Issue_3716-1.cfg
new file mode 100644
index 00000000..481776c1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-1.cfg
@@ -0,0 +1,2 @@
+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.76.0/tests/config/c/Issue_3716-2.cfg
new file mode 100644
index 00000000..e3064ece
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-2.cfg
@@ -0,0 +1,2 @@
+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.76.0/tests/config/c/Issue_3716-3.cfg
new file mode 100644
index 00000000..d803c2fd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-3.cfg
@@ -0,0 +1,2 @@
+mod_infinite_loop = 3
+mod_full_brace_do = add
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.76.0/tests/config/c/Issue_3716-4.cfg
new file mode 100644
index 00000000..4ff28748
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-4.cfg
@@ -0,0 +1,2 @@
+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.76.0/tests/config/c/Issue_3716-5.cfg
new file mode 100644
index 00000000..e25c6f03
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-5.cfg
@@ -0,0 +1,2 @@
+mod_infinite_loop = 5
+mod_full_brace_do = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3852.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3852.cfg
new file mode 100644
index 00000000..087272b9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3852.cfg
@@ -0,0 +1 @@
+sp_func_call_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3873.cfg
new file mode 100644
index 00000000..8179ffa5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3873.cfg
@@ -0,0 +1,5 @@
+sp_before_sparen       = force
+indent_cmt_with_tabs   = true
+nl_while_brace         = add
+align_right_cmt_span   = 3
+align_right_cmt_at_col = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/add_long_closebrace_comment_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/add_long_closebrace_comment_1.cfg
index b8190eb1..b8190eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/add_long_closebrace_comment_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/add_long_closebrace_comment_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-2.cfg
index ea78a8d4..ea78a8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-3.cfg
index 1b46c840..1b46c840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/align-4.cfg
new file mode 100644
index 00000000..1d35c349
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-4.cfg
@@ -0,0 +1 @@
+align_assign_span=2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_attr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_attr.cfg
index 3249cd7b..3249cd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_attr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_attr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-1.cfg
index 83874b8b..83874b8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-2.cfg
index 3afaa70a..3afaa70a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-3.cfg
index 1b1e7541..1b1e7541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-4.cfg
index 391526e0..391526e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-5.cfg
index 7fd9cd6c..7fd9cd6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-6.cfg
index 00d18433..00d18433 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-7.cfg
index 64af8258..64af8258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-8.cfg
index 4531b895..4531b895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-9.cfg
index 2b2b6b02..2b2b6b02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_keep_extra.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_keep_extra.cfg
index fcaab9f2..fcaab9f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_keep_extra.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/align_multi.cfg
new file mode 100644
index 00000000..33b236d5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_multi.cfg
@@ -0,0 +1,2 @@
+align_assign_span              = 3
+align_assign_on_multi_var_defs = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_right_cmt_gap-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_right_cmt_gap-1.cfg
index 46aaf838..46aaf838 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_right_cmt_gap-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_right_cmt_gap-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_418.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_418.cfg
index cdf7f052..cdf7f052 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_418.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_418.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_419.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_419.cfg
index a11c2102..a11c2102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_419.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_419.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_416.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_416.cfg
index 6280b856..6280b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_416.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_416.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_417.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_417.cfg
index 9d09abb2..9d09abb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_417.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_417.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_stack.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_stack.cfg
index d53a6bb3..d53a6bb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_stack.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/align_trailing_do_cmt.cfg
new file mode 100644
index 00000000..bebd4c83
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_trailing_do_cmt.cfg
@@ -0,0 +1,6 @@
+align_right_cmt_span = 10
+nl_brace_while       = remove
+nl_do_brace          = remove
+sp_do_brace_open     = add
+sp_brace_close_while = add
+sp_while_paren_open  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-1.cfg
index ea45e4d8..ea45e4d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-2.cfg
index 252f07ea..252f07ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_gap-3_span-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_gap-3_span-5.cfg
index 338f078f..338f078f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_gap-3_span-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_gap-3_span-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_047.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_047.cfg
index 2af44bb3..2af44bb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_047.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_047.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_048.cfg
index 81d0ba54..2d8e61ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_048.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_048.cfg
@@ -1,6 +1,6 @@
 indent_columns                  = 3
 indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_fcall_brace                  = add
 nl_if_brace                     = add
 nl_else_brace                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_049.cfg
index b8e6f708..50a5b61c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_049.cfg
@@ -2,4 +2,5 @@ sp_assign                       = force
 sp_after_comma                  = force
 indent_columns                  = 3
 indent_with_tabs                = 0
-align_nl_cont                   = true
\ No newline at end of file
+pp_multiline_define_body_indent = 3
+align_nl_cont                   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_050.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_050.cfg
index 0f0e30ac..0f0e30ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_050.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_050.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_051.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_051.cfg
index 786fb030..786fb030 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_051.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_051.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_052.cfg
index ba150be7..ba150be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_053.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_053.cfg
index 7cf1c682..a28d7dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_053.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_053.cfg
@@ -1,5 +1,5 @@
 sp_defined_paren                = force
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
-mod_full_brace_if               = add
\ No newline at end of file
+mod_full_brace_if               = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_054.cfg
index 56661763..56661763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_054.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_054.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_055.cfg
index f050b219..f87a7f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_055.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_055.cfg
@@ -1,6 +1,6 @@
 indent_columns                  = 3
 indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_while_brace                  = add
 nl_do_brace                     = add
 nl_brace_while                  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_056.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_056.cfg
new file mode 100644
index 00000000..fdf8230b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_056.cfg
@@ -0,0 +1,4 @@
+indent_columns                  = 3
+pp_multiline_define_body_indent = 3
+align_nl_cont                   = true
+pp_space_after                  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_057.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_057.cfg
index fbf24d72..fbf24d72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_057.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_057.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_058.cfg
index 7c908d56..60757d30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_058.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_058.cfg
@@ -3,6 +3,7 @@ sp_before_sparen                = force
 sp_return_paren                 = remove
 indent_columns                  = 3
 indent_switch_body              = 3
+pp_multiline_define_body_indent = 3
 nl_switch_brace                 = add
 eat_blanks_before_close_brace   = true
 align_nl_cont                   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_061.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_061.cfg
index 89f76fae..89f76fae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_061.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_061.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_063.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_063.cfg
index 3c5e88f1..91f0e92f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_063.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_063.cfg
@@ -1,6 +1,6 @@
 indent_columns                  = 3
 indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 align_var_def_span              = 2
 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.75.0/tests/config/c/ben_064.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_064.cfg
index f56efbdf..f56efbdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_064.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_064.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_065.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_065.cfg
index 21d55b16..21d55b16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_065.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_065.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_069.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_069.cfg
index d42173e1..d42173e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_069.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_069.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_070.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_070.cfg
index f304ca8a..f304ca8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_070.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_070.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_071.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_071.cfg
index 869f2a94..869f2a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_071.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_071.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_072.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_072.cfg
index 973d8c6c..e58fa4fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_072.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_072.cfg
@@ -1,3 +1,4 @@
 indent_columns                  = 3
+pp_multiline_define_body_indent = 3
 eat_blanks_before_close_brace   = true
-align_nl_cont                   = true
\ No newline at end of file
+align_nl_cont                   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_073.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_073.cfg
index 49f69643..fe9d6c05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_073.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_073.cfg
@@ -1,4 +1,4 @@
 sp_after_cast                   = remove
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
-align_assign_span               = 1
\ No newline at end of file
+nl_var_def_blk_end_func_top     = 1
+align_assign_span               = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_074.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_074.cfg
index 31a1de44..31a1de44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_074.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_074.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_075.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_075.cfg
index 9eca8a9b..9eca8a9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_075.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_075.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_076.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_076.cfg
index fb27ba74..fb27ba74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_076.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_076.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_077.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_077.cfg
index 4e9760f7..4e9760f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_077.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_077.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_078.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_078.cfg
index 54fcc628..54fcc628 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_078.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_078.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_079.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_079.cfg
index 77a732e5..77a732e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_079.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_079.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_080.cfg
index 45e16a8d..45e16a8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_080.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_080.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_081.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_081.cfg
index dc15820d..630b3cbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_081.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_081.cfg
@@ -1,3 +1,4 @@
 sp_before_ellipsis              = remove
 indent_columns                  = 3
-align_nl_cont                   = true
\ No newline at end of file
+pp_multiline_define_body_indent = 3
+align_nl_cont                   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_083.cfg
index 2ccee465..2bdf2afa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_083.cfg
@@ -1,2 +1,2 @@
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
\ No newline at end of file
+nl_var_def_blk_end_func_top     = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_084.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_084.cfg
index bbb0e675..c770772c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_084.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_084.cfg
@@ -6,7 +6,7 @@ sp_between_ptr_star             = remove
 sp_after_ptr_star               = remove
 sp_after_comma                  = force
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_struct_brace                 = add
 align_var_def_star_style        = 1
 align_var_struct_span           = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_085.cfg
index b02673d7..b02673d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_085.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_085.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_086.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_086.cfg
index 7ffcd831..7ffcd831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_086.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_086.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_087.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_087.cfg
index 2184c985..5b5592a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_087.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_087.cfg
@@ -16,7 +16,7 @@ indent_columns                  = 3
 indent_with_tabs                = 0
 indent_label                    = 2
 nl_assign_brace                 = add
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_fcall_brace                  = add
 nl_if_brace                     = add
 nl_else_brace                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_088.cfg
index 19cc7dc4..a8abed32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_088.cfg
@@ -1,4 +1,4 @@
 sp_before_sparen                = force
 sp_while_paren_open             = force
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_089.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_089.cfg
index d3c152df..d3c152df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_089.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_089.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_056.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_090.cfg
index 43e9f6cc..340afec1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_056.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_090.cfg
@@ -1,3 +1,3 @@
 indent_columns                  = 3
+pp_multiline_define_body_indent = 3
 align_nl_cont                   = true
-pp_space                        = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_091.cfg
index aec90af1..aec90af1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_092.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_092.cfg
index bb993d75..bb993d75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_092.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_092.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_093.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_093.cfg
index 4e50b52b..4e50b52b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_093.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_093.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_094.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_094.cfg
index 9ab0c51f..5ff0a09b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_094.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_094.cfg
@@ -1,6 +1,6 @@
 sp_inside_paren                 = remove
 sp_after_comma                  = force
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 align_assign_span               = 1
-mod_paren_on_return             = add
\ No newline at end of file
+mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_095.cfg
index edb10a4f..edb10a4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_095.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol-break.cfg
index d2abdeb6..d2abdeb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol.cfg
index f7fe1330..f7fe1330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-break.cfg
index e07ab7e9..e07ab7e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-force.cfg
index 36f81a26..36f81a26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol.cfg
index 9dbcbaf2..9dbcbaf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.cfg
index 2fc753a6..2fc753a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.rerun.cfg
index df289545..df289545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-gnu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-gnu.cfg
index c5bd1371..c5bd1371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-gnu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-gnu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-br.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-br.cfg
index 59bc4084..59bc4084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-br.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-br.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-nobr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-nobr.cfg
index 970b1ab0..970b1ab0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-nobr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-nobr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr.cfg
index 7ef5aa16..7ef5aa16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-2.cfg
index 9aa693fc..9aa693fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-all.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-all.cfg
index ca279abd..ca279abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-all.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-all.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws.cfg
index 76d8908a..76d8908a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws2.cfg
index 55eb6ece..55eb6ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1702.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1702.cfg
index 1c415eec..1c415eec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1702.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1702.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1718.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1718.cfg
index e55de095..e55de095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1718.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1718.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_2331.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_2331.cfg
index 4a4af2f3..4a4af2f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_2331.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_2331.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_489.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_489.cfg
index 61d4693c..61d4693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_489.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_489.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_i_771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_i_771.cfg
index 69b6e1a3..69b6e1a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_i_771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_i_771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-1.cfg
index 7c65a819..7c65a819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-2.cfg
index 07c0566d..07c0566d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-3.cfg
index 74f16293..74f16293 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-a.cfg
index 488198a9..488198a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-r.cfg
index 1d0138a2..1d0138a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-type.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-type.cfg
index 5900ffd5..5900ffd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-type.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-type.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cgal.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cgal.cfg
index a4ec1fa0..a4ec1fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cgal.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cgal.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/clang-has_include.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/clang-has_include.cfg
index 35d668f3..db006d08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/clang-has_include.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/clang-has_include.cfg
@@ -1,3 +1,3 @@
 sp_bool                         = force
 sp_func_call_paren              = remove
-pp_space                        = remove
+pp_space_after                  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_indent_multi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_indent_multi-f.cfg
index 1bd265a3..1bd265a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_indent_multi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_indent_multi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_multi_check_last-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_multi_check_last-f.cfg
index 7fdebde0..7fdebde0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_multi_check_last-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_multi_check_last-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_nl_end.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_nl_end.cfg
index 1c0b396a..1c0b396a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_nl_end.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_nl_end.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_reflow.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_reflow.cfg
index 9b280d18..9b280d18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_reflow.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_reflow.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/code_width-80.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/code_width-80.cfg
index 4bdb0ce7..4bdb0ce7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/code_width-80.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/code_width-80.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cond-1.cfg
index 61669da9..61669da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cond-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/convert_cmt_vbrace_one_line.cfg
new file mode 100644
index 00000000..dc5a6d92
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/convert_cmt_vbrace_one_line.cfg
@@ -0,0 +1,4 @@
+mod_full_brace_if      = add
+nl_after_brace_open    = true
+nl_if_leave_one_liners = true
+sp_inside_braces       = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-1.cfg
index 83e3aa7c..b5b95435 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-1.cfg
@@ -1,6 +1,7 @@
 # CPP to C comment conversion
 indent_columns                  = 4
 indent_with_tabs                = 0
+pp_multiline_define_body_indent = 4
 code_width                      = 80
 cmt_cpp_to_c                    = true
-cmt_star_cont                   = true
\ No newline at end of file
+cmt_star_cont                   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-2.cfg
index 9f0d9e3a..9f0d9e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-3.cfg
index 20bbb9e1..20bbb9e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/custom_types_ssl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/custom_types_ssl.cfg
index 4005234e..4005234e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/custom_types_ssl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/custom_types_ssl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-no.cfg
index bd2bd258..bd2bd258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-yes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-yes.cfg
index bc1d5584..bc1d5584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-yes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-yes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-1.cfg
index b4e4aecb..b4e4aecb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-2.cfg
index 75d7936e..75d7936e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/empty_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/empty_body.cfg
index 4563a84f..b737dfd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/empty_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/empty_body.cfg
@@ -3,4 +3,4 @@ sp_before_ptr_star     = remove
 sp_after_ptr_star      = force
 sp_after_ptr_star_func = force
 indent_columns         = 4
-nl_collapse_empty_body = true
+nl_collapse_empty_body_functions = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/endif.cfg
index ff69251b..ff69251b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/enum_comma_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/enum_comma_ifdef.cfg
index a2622767..a2622767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/enum_comma_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/enum_comma_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/force_tab_after_define-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/force_tab_after_define-t.cfg
index 67b04e78..67b04e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/force_tab_after_define-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/force_tab_after_define-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/freebsd.cfg
index 725b00b0..725b00b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/freebsd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/func_call_user.cfg
index 504fb3d8..504fb3d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ger.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ger.cfg
index 976c0c35..268a4f19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ger.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ger.cfg
@@ -11,7 +11,7 @@ indent_func_proto_param         = true
 indent_func_param_double        = true
 nl_end_of_file                  = add
 nl_end_of_file_min              = 2
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_multi_line_define            = true
 nl_ds_struct_enum_cmt           = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/i1564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/i1564.cfg
index 74c53e52..74c53e52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/i1564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/i1564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/if_chain.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/if_chain.cfg
index d3449cc5..d3449cc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/if_chain.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/if_chain.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-1.cfg
index 943d0eb6..943d0eb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-vbrace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-vbrace.cfg
index 7e6ca7c1..7e6ca7c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-vbrace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-vbrace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_assign.cfg
index 6bad61f1..6bad61f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_assign.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_assign.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-false.cfg
index 15e0e2e8..15e0e2e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-true.cfg
index abcadd59..abcadd59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_comment_align_thresh-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_comment_align_thresh-0.cfg
index dc730bf8..dc730bf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_comment_align_thresh-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_comment_align_thresh-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-false.cfg
index b686aabe..b686aabe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-true.cfg
index 9fa1d2ef..9fa1d2ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_call_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_call_param.cfg
index 26b4e03a..26b4e03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_call_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_call_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_def_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_def_param.cfg
index c448b21f..c448b21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_def_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_def_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_param.cfg
index 7db464b4..7db464b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_proto_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_proto_param.cfg
index 6cfb83ed..6cfb83ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_proto_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_proto_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ignore_bool-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_ignore_bool-true.cfg
index 0f952471..0f952471 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ignore_bool-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_ignore_bool-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_macro_brace-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-false.cfg
index f9e3bdca..f9e3bdca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_macro_brace-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_macro_brace-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-true.cfg
index 62573cad..62573cad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_macro_brace-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close--1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close--1.cfg
index 0656a55f..0656a55f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close--1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close--1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-1.cfg
index e380b281..e380b281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-2.cfg
index 2a77fedf..2a77fedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_single_line_comments_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_single_line_comments_after.cfg
index bae9787c..bae9787c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_single_line_comments_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_single_line_comments_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_sparen_extra-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_sparen_extra-8.cfg
index 6344ceb2..6344ceb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_sparen_extra-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_sparen_extra-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/issue_527.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/issue_527.cfg
index aa11dbbc..cb63239a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/issue_527.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/issue_527.cfg
@@ -161,7 +161,7 @@ nl_end_of_file_min            = 0
 nl_assign_brace               = ignore

 nl_assign_square              = ignore

 nl_after_square_assign        = ignore

-nl_func_var_def_blk           = 0

+nl_var_def_blk_end_func_top   = 0

 nl_fcall_brace                = ignore

 nl_enum_brace                 = ignore

 nl_struct_brace               = ignore

@@ -259,7 +259,7 @@ cmt_sp_before_star_cont       = 0
 cmt_sp_after_star_cont        = 0

 pp_indent                     = ignore

 pp_indent_at_level            = false

-pp_space                      = ignore

+pp_space_after                = ignore

 pp_indent_region              = 0

 pp_region_indent_code         = false

 pp_indent_if                  = 0

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
index 5c394f28..5c394f28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
index b1fafca7..b1fafca7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/leave_one_liners.cfg
index 931e9465..931e9465 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/leave_one_liners.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/leave_one_liners.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren.cfg
index 2c0049ab..2c0049ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren2.cfg
index 113ee868..113ee868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_case_brace_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_case_brace_add.cfg
index bfcca51a..bfcca51a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_case_brace_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/mod_infinite_loop-0.cfg
new file mode 100644
index 00000000..52428063
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-0.cfg
@@ -0,0 +1 @@
+mod_infinite_loop = 0
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
new file mode 100644
index 00000000..d387a19e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-1.cfg
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..bd311daf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-2.cfg
@@ -0,0 +1 @@
+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.76.0/tests/config/c/mod_infinite_loop-3.cfg
new file mode 100644
index 00000000..b026525b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-3.cfg
@@ -0,0 +1 @@
+mod_infinite_loop = 3
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
new file mode 100644
index 00000000..07388b83
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-4.cfg
@@ -0,0 +1 @@
+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.76.0/tests/config/c/mod_infinite_loop-5.cfg
new file mode 100644
index 00000000..4b127892
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-5.cfg
@@ -0,0 +1 @@
+mod_infinite_loop = 5
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.76.0/tests/config/c/mod_int-add-all-prefer-left.cfg
new file mode 100644
index 00000000..2f0fd00d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-add-all-prefer-left.cfg
@@ -0,0 +1,9 @@
+mod_int_short    = add
+mod_short_int    = add
+mod_int_long     = add
+mod_long_int     = add
+mod_int_signed   = add
+mod_signed_int   = add
+mod_int_unsigned = add
+mod_unsigned_int = add
+mod_int_prefer_int_on_left = true
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.76.0/tests/config/c/mod_int-add-all-prefer-right.cfg
new file mode 100644
index 00000000..35b3d317
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-add-all-prefer-right.cfg
@@ -0,0 +1,9 @@
+mod_int_short    = add
+mod_short_int    = add
+mod_int_long     = add
+mod_long_int     = add
+mod_int_signed   = add
+mod_signed_int   = add
+mod_int_unsigned = add
+mod_unsigned_int = add
+mod_int_prefer_int_on_left = false
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.76.0/tests/config/c/mod_int-remove-all.cfg
new file mode 100644
index 00000000..d072c2f4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-all.cfg
@@ -0,0 +1,8 @@
+mod_int_short    = remove
+mod_short_int    = remove
+mod_int_long     = remove
+mod_long_int     = remove
+mod_int_signed   = remove
+mod_signed_int   = remove
+mod_int_unsigned = remove
+mod_unsigned_int = remove
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.76.0/tests/config/c/mod_int-remove-left.cfg
new file mode 100644
index 00000000..b2396016
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-left.cfg
@@ -0,0 +1,4 @@
+mod_int_short    = remove
+mod_int_long     = remove
+mod_int_signed   = remove
+mod_int_unsigned = remove
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.76.0/tests/config/c/mod_int-remove-right.cfg
new file mode 100644
index 00000000..aa16c67c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-right.cfg
@@ -0,0 +1,4 @@
+mod_short_int    = remove
+mod_long_int     = remove
+mod_signed_int   = remove
+mod_unsigned_int = remove
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.76.0/tests/config/c/mod_int-shift-left.cfg
new file mode 100644
index 00000000..4db8af41
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-shift-left.cfg
@@ -0,0 +1,9 @@
+mod_int_short    = add
+mod_short_int    = remove
+mod_int_long     = add
+mod_long_int     = remove
+mod_int_signed   = add
+mod_signed_int   = remove
+mod_int_unsigned = add
+mod_unsigned_int = remove
+mod_int_prefer_int_on_left = true
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.76.0/tests/config/c/mod_int-shift-right.cfg
new file mode 100644
index 00000000..78c5806b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-shift-right.cfg
@@ -0,0 +1,9 @@
+mod_int_short    = remove
+mod_short_int    = add
+mod_int_long     = remove
+mod_long_int     = add
+mod_int_signed   = remove
+mod_signed_int   = add
+mod_int_unsigned = remove
+mod_unsigned_int = add
+mod_int_prefer_int_on_left = false
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.76.0/tests/config/c/mod_int_long-a.cfg
new file mode 100644
index 00000000..c8cd7a2c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_long-a.cfg
@@ -0,0 +1 @@
+mod_int_long = add
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.76.0/tests/config/c/mod_int_long-r.cfg
new file mode 100644
index 00000000..2f499ac8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_long-r.cfg
@@ -0,0 +1 @@
+mod_int_long = remove
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.76.0/tests/config/c/mod_int_short-a.cfg
new file mode 100644
index 00000000..94ca506b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_short-a.cfg
@@ -0,0 +1 @@
+mod_int_short = add
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.76.0/tests/config/c/mod_int_short-r.cfg
new file mode 100644
index 00000000..e6458b57
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_short-r.cfg
@@ -0,0 +1 @@
+mod_int_short = remove
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.76.0/tests/config/c/mod_int_signed-a.cfg
new file mode 100644
index 00000000..f2ad55d3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_signed-a.cfg
@@ -0,0 +1 @@
+mod_int_signed = add
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.76.0/tests/config/c/mod_int_signed-r.cfg
new file mode 100644
index 00000000..7e418238
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_signed-r.cfg
@@ -0,0 +1 @@
+mod_int_signed = remove
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.76.0/tests/config/c/mod_int_unsigned-a.cfg
new file mode 100644
index 00000000..fcafcddc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_unsigned-a.cfg
@@ -0,0 +1 @@
+mod_int_unsigned = add
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.76.0/tests/config/c/mod_int_unsigned-r.cfg
new file mode 100644
index 00000000..cef8d459
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_unsigned-r.cfg
@@ -0,0 +1 @@
+mod_int_unsigned = remove
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.76.0/tests/config/c/mod_long_int-a.cfg
new file mode 100644
index 00000000..c3ac76dd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_long_int-a.cfg
@@ -0,0 +1 @@
+mod_long_int = add
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.76.0/tests/config/c/mod_long_int-r.cfg
new file mode 100644
index 00000000..15a40e52
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_long_int-r.cfg
@@ -0,0 +1 @@
+mod_long_int = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_move_case_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_move_case_brace.cfg
index acb25734..acb25734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_move_case_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_move_case_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_move_case_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_move_case_return.cfg
index 0e698ea9..0e698ea9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_move_case_return.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/mod_short_int-a.cfg
new file mode 100644
index 00000000..d6986aa1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_short_int-a.cfg
@@ -0,0 +1 @@
+mod_short_int = add
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.76.0/tests/config/c/mod_short_int-r.cfg
new file mode 100644
index 00000000..53daa53f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_short_int-r.cfg
@@ -0,0 +1 @@
+mod_short_int = remove
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.76.0/tests/config/c/mod_signed_int-a.cfg
new file mode 100644
index 00000000..e951d8e7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_signed_int-a.cfg
@@ -0,0 +1 @@
+mod_signed_int = add
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.76.0/tests/config/c/mod_signed_int-r.cfg
new file mode 100644
index 00000000..aa70348d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_signed_int-r.cfg
@@ -0,0 +1 @@
+mod_signed_int = remove
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.76.0/tests/config/c/mod_unsigned_int-a.cfg
new file mode 100644
index 00000000..7141c9cf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_unsigned_int-a.cfg
@@ -0,0 +1 @@
+mod_unsigned_int = add
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.76.0/tests/config/c/mod_unsigned_int-r.cfg
new file mode 100644
index 00000000..06f93143
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_unsigned_int-r.cfg
@@ -0,0 +1 @@
+mod_unsigned_int = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/my_conf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/my_conf.cfg
index 6bfddbb5..6bfddbb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/my_conf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/my_conf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nepenthes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nepenthes.cfg
index 150294da..150294da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nepenthes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nepenthes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/newline_after_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/newline_after_endif.cfg
index afd7693d..afd7693d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/newline_after_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/newline_after_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl-comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl-comment.cfg
index c6ef78f9..0d1e2a11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl-comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl-comment.cfg
@@ -1,5 +1,5 @@
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_for_brace                    = add
 nl_before_block_comment         = 3
 nl_before_c_comment             = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign1.cfg
index 1f4da850..1f4da850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign2.cfg
index b4cfb4d1..b4cfb4d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_false.cfg
index 7636745b..7636745b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_true.cfg
index 1e6976fc..1e6976fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_brace_test.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_brace_test.cfg
index c9faeb04..0d3f7109 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_brace_test.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_brace_test.cfg
@@ -4,7 +4,7 @@ sp_before_sparen                = add
 sp_func_def_paren               = add
 sp_return_paren                 = add
 indent_columns                  = 2
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = force
 nl_for_brace                    = add
 nl_fdef_brace                   = force
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.76.0/tests/config/c/nl_collapse_empty_1.cfg
new file mode 100644
index 00000000..e480c46c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_1.cfg
@@ -0,0 +1,2 @@
+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.76.0/tests/config/c/nl_collapse_empty_2.cfg
new file mode 100644
index 00000000..e7313c5f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_2.cfg
@@ -0,0 +1,2 @@
+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.76.0/tests/config/c/nl_collapse_empty_3.cfg
new file mode 100644
index 00000000..b0e47279
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_3.cfg
@@ -0,0 +1,2 @@
+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.76.0/tests/config/c/nl_collapse_empty_4.cfg
new file mode 100644
index 00000000..3d58e483
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_4.cfg
@@ -0,0 +1,2 @@
+nl_collapse_empty_body = true
+nl_collapse_empty_body_functions = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_create_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_create_one_liner.cfg
index ec8b120c..ec8b120c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_create_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_create_one_liner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum-2.cfg
index 01c60de4..01c60de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
index 1864b51d..1864b51d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_endif.cfg
index b056153e..b056153e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.cfg
index b6a28869..b6a28869 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
index f0d3f7b2..f0d3f7b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-4.cfg
index 70973ec8..70973ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-a.cfg
index 66e7dbfa..66e7dbfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/nl_func_call-1.cfg
new file mode 100644
index 00000000..e3befa10
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-1.cfg
@@ -0,0 +1,10 @@
+nl_func_call_args              = add
+nl_func_call_start             = add
+nl_func_call_paren             = add
+nl_func_call_paren_empty       = add
+nl_func_call_empty             = add
+nl_func_call_end               = add
+nl_func_call_start_multi_line  = false
+nl_func_call_args_multi_line   = true
+nl_func_call_end_multi_line    = true
+set FUNC_CALL_USER userfunc
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.76.0/tests/config/c/nl_func_call-2.cfg
new file mode 100644
index 00000000..7b366b5b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-2.cfg
@@ -0,0 +1,10 @@
+nl_func_call_args              = ignore
+nl_func_call_start             = add
+nl_func_call_paren             = add
+nl_func_call_paren_empty       = add
+nl_func_call_empty             = add
+nl_func_call_end               = add
+nl_func_call_start_multi_line  = true
+nl_func_call_args_multi_line   = true
+nl_func_call_end_multi_line    = true
+set FUNC_CALL_USER userfunc
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.76.0/tests/config/c/nl_func_call-3.cfg
new file mode 100644
index 00000000..44c64753
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-3.cfg
@@ -0,0 +1,10 @@
+nl_func_call_args              = remove
+nl_func_call_start             = remove
+nl_func_call_paren             = remove
+nl_func_call_paren_empty       = remove
+nl_func_call_empty             = remove
+nl_func_call_end               = remove
+nl_func_call_start_multi_line  = false
+nl_func_call_args_multi_line   = false
+nl_func_call_end_multi_line    = false
+set FUNC_CALL_USER userfunc
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.76.0/tests/config/c/nl_func_call-4.cfg
new file mode 100644
index 00000000..af273843
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-4.cfg
@@ -0,0 +1,10 @@
+nl_func_call_args              = ignore
+nl_func_call_start             = remove
+nl_func_call_paren             = remove
+nl_func_call_paren_empty       = remove
+nl_func_call_empty             = remove
+nl_func_call_end               = remove
+nl_func_call_start_multi_line  = false
+nl_func_call_args_multi_line   = false
+nl_func_call_end_multi_line    = false
+set FUNC_CALL_USER userfunc
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.76.0/tests/config/c/nl_func_call-5.cfg
new file mode 100644
index 00000000..6e5553c0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-5.cfg
@@ -0,0 +1,10 @@
+nl_func_call_args              = add
+nl_func_call_start             = ignore
+nl_func_call_paren             = ignore
+nl_func_call_paren_empty       = ignore
+nl_func_call_empty             = ignore
+nl_func_call_end               = ignore
+nl_func_call_start_multi_line  = false
+nl_func_call_args_multi_line   = false
+nl_func_call_end_multi_line    = false
+set FUNC_CALL_USER userfunc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_semicolon.cfg
index d099e0c7..d099e0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_whole_file_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_whole_file_ifdef.cfg
index 1d6a585a..1d6a585a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_whole_file_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_whole_file_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pascal_ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pascal_ptr.cfg
index 1760abca..1760abca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pascal_ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pascal_ptr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-eol.cfg
index 90267209..90267209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-sol.cfg
index a4235d7d..a4235d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-l.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-l.cfg
index 11eb46fd..11eb46fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-l.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-l.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-t.cfg
index 79bb52d0..79bb52d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-indent-2.cfg
index 64f53643..1387ccfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-indent-2.cfg
@@ -1,8 +1,8 @@
 #  Remove all PP spacing and indent
 pp_indent                       = remove
-pp_space                        = add
+pp_space_after                  = add
 # Gives the format
 # |#ifdef SOMETHING
 # |#  define X
 # |#endif
-pp_space_count                  = 2
\ No newline at end of file
+pp_space_count                  = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-space.cfg
index e91685ab..e91685ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-0.cfg
index 82f11f27..82f11f27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-1.cfg
index 7c01e819..7c01e819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-2.cfg
index 6f912806..6f912806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-3.cfg
index 4b876498..4b876498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-4.cfg
index fe29f734..fe29f734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent_code-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent_code-true.cfg
index cb00f671..cb00f671 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent_code-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent_code-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-false.cfg
index 6f780147..6f780147 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-true.cfg
index bc062b9f..bc062b9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent-a.cfg
index f9f9b3b3..f9f9b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent_brace--1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_brace--1.cfg
index ecd054cb..ecd054cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent_brace--1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_brace--1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent_in_guard.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_in_guard.cfg
index 2c4e2545..2c4e2545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent_in_guard.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/pp_indent_with_tabs_-1_0.cfg
new file mode 100644
index 00000000..7e50c5a8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_0.cfg
@@ -0,0 +1,5 @@
+output_tab_size = 2
+indent_columns = 2
+indent_with_tabs = 0
+pp_indent = force
+pp_indent_with_tabs = -1
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.76.0/tests/config/c/pp_indent_with_tabs_-1_1.cfg
new file mode 100644
index 00000000..c3daa492
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_1.cfg
@@ -0,0 +1,5 @@
+output_tab_size = 2
+indent_columns = 2
+indent_with_tabs = 1
+pp_indent = force
+pp_indent_with_tabs = -1
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.76.0/tests/config/c/pp_indent_with_tabs_-1_2.cfg
new file mode 100644
index 00000000..bb793d00
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_2.cfg
@@ -0,0 +1,5 @@
+output_tab_size = 2
+indent_columns = 2
+indent_with_tabs = 2
+pp_indent = force
+pp_indent_with_tabs = -1
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.76.0/tests/config/c/pp_indent_with_tabs_0.cfg
new file mode 100644
index 00000000..85aa06bc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_0.cfg
@@ -0,0 +1,4 @@
+output_tab_size = 2
+indent_columns = 2
+pp_indent = force
+pp_indent_with_tabs = 0
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.76.0/tests/config/c/pp_indent_with_tabs_1.cfg
new file mode 100644
index 00000000..4a798a12
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_1.cfg
@@ -0,0 +1,4 @@
+output_tab_size = 2
+indent_columns = 2
+pp_indent = force
+pp_indent_with_tabs = 1
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.76.0/tests/config/c/pp_indent_with_tabs_2.cfg
new file mode 100644
index 00000000..11c06aa2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_2.cfg
@@ -0,0 +1,4 @@
+output_tab_size = 2
+indent_columns = 2
+pp_indent = force
+pp_indent_with_tabs = 2
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.76.0/tests/config/c/pp_multiline_define_align_nl.cfg
new file mode 100644
index 00000000..549e031f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_nl.cfg
@@ -0,0 +1,5 @@
+input_tab_size        = 2
+output_tab_size       = 2
+indent_columns        = 2
+pp_indent_with_tabs   = 0
+align_nl_cont         = true
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.76.0/tests/config/c/pp_multiline_define_align_pp_cnt3.cfg
new file mode 100644
index 00000000..70b1a6b4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_cnt3.cfg
@@ -0,0 +1,7 @@
+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
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.76.0/tests/config/c/pp_multiline_define_align_pp_col1.cfg
new file mode 100644
index 00000000..fe6b63c7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_col1.cfg
@@ -0,0 +1,7 @@
+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
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.76.0/tests/config/c/pp_multiline_define_align_pp_ml-1.cfg
new file mode 100644
index 00000000..20526ce9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml-1.cfg
@@ -0,0 +1,8 @@
+input_tab_size                  = 2
+output_tab_size                 = 2
+indent_columns                  = 2
+pp_indent_with_tabs             = 0
+pp_indent_count                 = 2
+pp_multiline_define_body_indent = -1
+pp_indent                       = force
+align_nl_cont                   = true
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.76.0/tests/config/c/pp_multiline_define_align_pp_ml-5.cfg
new file mode 100644
index 00000000..d09a083d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml-5.cfg
@@ -0,0 +1,8 @@
+input_tab_size                  = 2
+output_tab_size                 = 2
+indent_columns                  = 2
+pp_indent_with_tabs             = 0
+pp_indent_count                 = 2
+pp_multiline_define_body_indent = -5
+pp_indent                       = force
+align_nl_cont                   = true
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.76.0/tests/config/c/pp_multiline_define_align_pp_ml0.cfg
new file mode 100644
index 00000000..694bdca5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml0.cfg
@@ -0,0 +1,8 @@
+input_tab_size                  = 2
+output_tab_size                 = 2
+indent_columns                  = 2
+pp_indent_with_tabs             = 0
+pp_indent_count                 = 2
+pp_multiline_define_body_indent = 0
+pp_indent                       = force
+align_nl_cont                   = true
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.76.0/tests/config/c/pp_multiline_define_align_pp_ml2.cfg
new file mode 100644
index 00000000..6a55e5b9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml2.cfg
@@ -0,0 +1,8 @@
+input_tab_size                  = 2
+output_tab_size                 = 2
+indent_columns                  = 2
+pp_indent_with_tabs             = 0
+pp_indent_count                 = 2
+pp_multiline_define_body_indent = 2
+pp_indent                       = force
+align_nl_cont                   = true
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.76.0/tests/config/c/pp_multiline_define_align_pp_ml4.cfg
new file mode 100644
index 00000000..2206a130
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml4.cfg
@@ -0,0 +1,8 @@
+input_tab_size                  = 2
+output_tab_size                 = 2
+indent_columns                  = 2
+pp_indent_with_tabs             = 0
+pp_indent_count                 = 2
+pp_multiline_define_body_indent = 4
+pp_indent                       = force
+align_nl_cont                   = true
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.76.0/tests/config/c/pp_multiline_define_ignore_body.cfg
new file mode 100644
index 00000000..ad3114b8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_ignore_body.cfg
@@ -0,0 +1,5 @@
+input_tab_size        = 2
+output_tab_size       = 2
+indent_columns        = 2
+pp_indent_with_tabs   = 0
+pp_ignore_define_body = true
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.76.0/tests/config/c/pp_multiline_define_with_spaces.cfg
new file mode 100644
index 00000000..1b4c74ab
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_with_spaces.cfg
@@ -0,0 +1,4 @@
+input_tab_size        = 2
+output_tab_size       = 2
+indent_columns        = 2
+pp_indent_with_tabs   = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_ret.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_ret.cfg
index b1fb2000..b1fb2000 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_ret.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/pp_space_after.cfg
new file mode 100644
index 00000000..9bc1026a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_after.cfg
@@ -0,0 +1,3 @@
+pp_indent       = remove
+pp_space_after  = force
+pp_space_count  = 1
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.76.0/tests/config/c/pp_space_before.cfg
new file mode 100644
index 00000000..e26fbfe4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_before.cfg
@@ -0,0 +1,3 @@
+pp_indent       = force
+pp_indent_count = 1
+pp_space_after  = remove
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.76.0/tests/config/c/pp_space_before_after.cfg
new file mode 100644
index 00000000..94765577
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_before_after.cfg
@@ -0,0 +1,4 @@
+pp_indent       = force
+pp_indent_count = 1
+pp_space_after  = force
+pp_space_count  = 1
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.76.0/tests/config/c/pp_space_none.cfg
new file mode 100644
index 00000000..5287a565
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_none.cfg
@@ -0,0 +1,2 @@
+pp_indent       = remove
+pp_space_after  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/preproc-cleanup.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/preproc-cleanup.cfg
index 73fc557c..4773d091 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/preproc-cleanup.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/preproc-cleanup.cfg
@@ -33,5 +33,5 @@ align_var_struct_span           = 99
 align_typedef_gap               = 3
 align_typedef_span              = 5
 mod_paren_on_return             = add
-pp_space                        = remove
+pp_space_after                  = remove
 sp_before_vardef_square         = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ptr-arith.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ptr-arith.cfg
index ff1949d3..ff1949d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ptr-arith.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ptr-arith.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/rdan.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/rdan.cfg
index 4eb5f019..1c1b0c68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/rdan.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/rdan.cfg
@@ -11,7 +11,7 @@ indent_func_def_force_col1      = true
 indent_col1_comment             = true
 indent_bool_paren               = 1
 indent_first_bool_expr          = true
-nl_func_var_def_blk             = 2
+nl_var_def_blk_end_func_top     = 2
 nl_if_brace                     = force
 nl_while_brace                  = force
 nl_after_semicolon              = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-1.cfg
index 996ca632..996ca632 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-2.cfg
index 87b361d8..87b361d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-3.cfg
index 9caf1a7e..9caf1a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-4.cfg
index 9a885287..9a885287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf537.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf537.cfg
index 400c7e0b..400c7e0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf537.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf537.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf538.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf538.cfg
index 8c6d149b..8c6d149b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf538.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf538.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_pointer_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_pointer_star-r.cfg
index 92a637a1..92a637a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_pointer_star-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_pointer_star-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_sparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_sparen.cfg
index c9b9afbf..c9b9afbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_sparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_sparen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-i.cfg
index 146f6d61..146f6d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-r.cfg
index 26dcc001..26dcc001 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cmt_cpp_start-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cmt_cpp_start-r.cfg
index 13ceebfc..13ceebfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cmt_cpp_start-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cmt_cpp_start-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cond_colon.cfg
index d39afa14..d39afa14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-f.cfg
index 68a83e91..68a83e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-i.cfg
index 04f49ee7..04f49ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-r.cfg
index f45d357b..f45d357b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-a.cfg
index ada72096..ada72096 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-f.cfg
index 0e358549..0e358549 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-i.cfg
index f18a88b3..f18a88b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-r.cfg
index 22785029..22785029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_func_call_user_inside_fparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
index e5650760..e5650760 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-a.cfg
index a21ed3da..a21ed3da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-f.cfg
index 9562f157..9562f157 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-i.cfg
index e18cc959..e18cc959 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-r.cfg
index ec9bf9c0..ec9bf9c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-a.cfg
index 0d477f4d..0d477f4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-i.cfg
index 750b77ff..750b77ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/space_indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/space_indent_columns-3.cfg
index ec130371..ec130371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/space_indent_columns-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/c/star-style-0.cfg
new file mode 100644
index 00000000..dd69e7f8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-0.cfg
@@ -0,0 +1,12 @@
+align_var_def_star_style        = 0
+
+align_func_params               = true
+align_func_params_gap           = 8
+align_func_params_span          = 16
+
+align_var_def_gap               = 6
+align_var_def_span              = 16
+
+sp_after_ptr_star               = remove
+sp_between_ptr_star             = remove
+
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.76.0/tests/config/c/star-style-1.cfg
new file mode 100644
index 00000000..842dc820
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-1.cfg
@@ -0,0 +1,12 @@
+align_var_def_star_style        = 1
+
+align_func_params               = true
+align_func_params_gap           = 8
+align_func_params_span          = 16
+
+align_var_def_gap               = 6
+align_var_def_span              = 16
+
+sp_after_ptr_star               = remove
+sp_between_ptr_star             = remove
+
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.76.0/tests/config/c/star-style-2.cfg
new file mode 100644
index 00000000..0165f975
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-2.cfg
@@ -0,0 +1,12 @@
+align_var_def_star_style        = 2
+
+align_func_params               = true
+align_func_params_gap           = 8
+align_func_params_span          = 16
+
+align_var_def_gap               = 6
+align_var_def_span              = 16
+
+sp_after_ptr_star               = remove
+sp_between_ptr_star             = remove
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/type_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/type_wrap.cfg
index eeea5786..eeea5786 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/type_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/type_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width-3.cfg
index 843f6669..843f6669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width.cfg
index 10cb731c..10cb731c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/xml-str.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/xml-str.cfg
index bd667ab4..bd667ab4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/xml-str.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/xml-str.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/Issue_3052.cfg
index f7c29b8e..f7c29b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/Issue_3052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/UNI-18777.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/UNI-18777.cfg
index 7d4c013e..7d4c013e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/UNI-18777.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/UNI-18777.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_call_user.cfg
index 3219bc4b..3219bc4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_def.cfg
index c4575b88..c4575b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_def.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
index 8e25aaed..8e25aaed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
index 57e2463e..57e2463e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet.cfg
index f1a4b429..170c9488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet.cfg
@@ -314,7 +314,7 @@ nl_end_of_file_min                                   = 1
 nl_assign_brace                                      = remove
 nl_assign_square                                     = ignore
 nl_after_square_assign                               = ignore
-nl_func_var_def_blk                                  = 0
+nl_var_def_blk_end_func_top                          = 0
 nl_typedef_blk_start                                 = 0
 nl_typedef_blk_end                                   = 0
 nl_typedef_blk_in                                    = 0
@@ -497,13 +497,14 @@ cmt_insert_before_preproc                            = false
 pp_indent                                            = ignore
 pp_indent_at_level                                   = false
 pp_indent_count                                      = 1
-pp_space                                             = ignore
+pp_space_after                                       = ignore
 pp_space_count                                       = 0
 pp_indent_region                                     = 0
 pp_region_indent_code                                = false
 pp_indent_if                                         = 0
 pp_if_indent_code                                    = false
 pp_define_at_level                                   = false
+pp_multiline_define_body_indent                      = 4
 
 # Add or remove newline between method declaration and '{'
 nl_oc_mdef_brace                                     = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align-1.cfg
index 720f003e..720f003e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/align_same_func_call_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align_same_func_call_params-t.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/align_same_func_call_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align_same_func_call_params-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/attribute_specifier_seqs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/attribute_specifier_seqs.cfg
index 3a7f6096..3a7f6096 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/attribute_specifier_seqs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/attribute_specifier_seqs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben2.cfg
index 8398a6b9..fd376dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben2.cfg
@@ -21,7 +21,7 @@ indent_with_tabs                = 0
 indent_class                    = true
 indent_label                    = 2
 nl_assign_brace                 = add
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_fcall_brace                  = add
 nl_if_brace                     = add
 nl_else_brace                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_011.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_011.cfg
index 6ade29ad..6ade29ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_011.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_011.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_042.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_042.cfg
index c98cdf54..c98cdf54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_042.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_042.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bool-pos-eol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bool-pos-eol-force.cfg
index 51044559..51044559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bool-pos-eol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bool-pos-eol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/brace-allman.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/brace-allman.cfg
index 0e903302..0e903302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/brace-allman.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/brace-allman.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bug_671.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bug_671.cfg
index 00c0cf36..00c0cf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bug_671.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bug_671.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.cfg
index 0ca4890e..e3325392 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.cfg
@@ -15,7 +15,7 @@ indent_with_tabs                = 0
 indent_braces                   = true
 indent_single_line_comments_before = 2
 indent_switch_case              = 2
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_else_brace                   = add
 nl_for_brace                    = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.rerun.cfg
index 3b33c7d6..3b33c7d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/class-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/class-header.h
index 32e68a34..32e68a34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/class-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/class-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-0.cfg
index 86d05f95..86d05f95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-1.cfg
index 91dbf03a..91dbf03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/d.cfg
index e9be1e99..d45001c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/d.cfg
@@ -26,7 +26,7 @@ indent_with_tabs                = 0
 indent_class                    = true
 indent_case_brace               = 4
 indent_label                    = 2
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_var_def_blk_end              = 1
 nl_enum_brace                   = add
 nl_if_brace                     = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/del_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/del_semicolon.cfg
index 13434168..13434168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/del_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/del_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/empty.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file-header.h
index 63fb5185..63fb5185 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_footer.txt
index 7ce80bad..7ce80bad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_header.txt
index 5431d0ff..5431d0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-1.cfg
index 14879a94..14879a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-2.cfg
index f9cf836c..f9cf836c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-3.cfg
index c868ae02..c868ae02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header.h
index e6f83943..e6f83943 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header2.h
index 52bdf970..52bdf970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/function_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/function_header.txt
index c6508a02..c6508a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/function_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/function_header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_columns-3.cfg
index d49cfc22..d49cfc22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_columns-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_columns-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_continue-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_continue-8.cfg
index 9bc69559..9bc69559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_continue-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_continue-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_inside_ternary_operator.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_inside_ternary_operator.cfg
index ad5f98ed..ad5f98ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_inside_ternary_operator.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_inside_ternary_operator.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-1.cfg
index 80ea4e7a..80ea4e7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-2.cfg
index 1d5a91ab..1d5a91ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_var_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_var_def.cfg
index 2faffc24..4345ee72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_var_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_var_def.cfg
@@ -2,7 +2,8 @@ sp_assign                       = force
 indent_columns                  = 3
 indent_class                    = true
 indent_var_def_blk              = -3
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
+nl_var_def_blk_end              = 1
 nl_fdef_brace                   = add
 align_var_def_span              = 1
 align_assign_span               = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/issue_672.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/issue_672.cfg
index fb436753..fb436753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/issue_672.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/issue_672.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst.cfg
index 163d6f64..163d6f64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst2.cfg
index 7f531264..7f531264 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst3.cfg
index b96dc493..1b4018f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst3.cfg
@@ -26,7 +26,7 @@ indent_switch_case              = 4
 nl_end_of_file                  = add
 nl_end_of_file_min              = 1
 nl_assign_brace                 = add
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_enum_brace                   = add
 nl_struct_brace                 = add
 nl_union_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst4.cfg
index a269bdf8..a269bdf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_case_brace_rm.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_case_brace_rm.cfg
index 51252b69..51252b69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_case_brace_rm.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_case_brace_rm.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
index ec61c84b..ec61c84b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-a.cfg
index 6e5a38ec..6e5a38ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-r.cfg
index fb547f72..fb547f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/msg-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/msg-header.h
index 79a0919f..79a0919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/msg-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/msg-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_after.cfg
index b80dafa0..b80dafa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_ignore_after_case.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_ignore_after_case.cfg
index 6d1bbb7d..6d1bbb7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_ignore_after_case.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_ignore_after_case.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-0.cfg
index a837d86f..a837d86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-1.cfg
index 48ae77f3..48ae77f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-2.cfg
index 5beed445..5beed445 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-3.cfg
index 30a01c96..30a01c96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sort_imports.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sort_imports.cfg
index 655a684f..655a684f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sort_imports.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sort_imports.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_cast.cfg
index c16cc978..c16cc978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-f.cfg
index b7fa74f4..b7fa74f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-r.cfg
index 78a64119..78a64119 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_arith-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_arith-f.cfg
index 6cd2b6b0..6cd2b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_arith-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_arith-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_before_byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_before_byref-r.cfg
index 2f5d1eff..2f5d1eff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_before_byref-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_before_byref-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start-a.cfg
index d7e6adf1..d7e6adf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start_force.cfg
index e87c9b0d..e87c9b0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cparen_oparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cparen_oparen-f.cfg
index c2af4d15..c2af4d15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cparen_oparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cparen_oparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
index 2b159a36..2b159a36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/space_indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/space_indent_columns-4.cfg
index f05c685f..f05c685f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/space_indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/space_indent_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/star_pos-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/star_pos-0.cfg
index 3648d94a..3648d94a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/star_pos-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/star_pos-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.cfg
index 6c18a158..6c18a158 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.rerun.cfg
index c74e4020..c74e4020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2185.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2185.cfg
index fda2290c..fda2290c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2185.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2185.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2203.cfg
index e9c359cf..e9c359cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2203.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2203.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/623_caret-spacing.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/623_caret-spacing.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/623_caret-spacing.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/623_caret-spacing.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/633_decl-in-func-typedef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/633_decl-in-func-typedef.cfg
index 0edd4124..0edd4124 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/633_decl-in-func-typedef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/633_decl-in-func-typedef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-0.cfg
index 8aef4713..8aef4713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-1.cfg
index f97e0abe..f97e0abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-2.cfg
index 6c39bace..6c39bace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I1112-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I1112-2.cfg
index 6b1bba41..6b1bba41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I1112-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I1112-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I2103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I2103.cfg
index 5c34ca18..5c34ca18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I2103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I2103.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1052.cfg
index 91fe8899..91fe8899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1167.cfg
index feb56c83..feb56c83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1184.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1184.cfg
index 0fdd95de..0fdd95de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1184.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1184.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1460.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1460.cfg
index 7adee60a..7adee60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1460.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1460.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1511.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1511.cfg
index 71c01f4d..71c01f4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1511.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1511.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1692.cfg
index db3cbdbe..db3cbdbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1692.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1703.cfg
index f8c889ab..f8c889ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1703.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1703.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1734.cfg
index 37a4c192..37a4c192 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1753.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1753.cfg
index e0e5ab0b..e0e5ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1753.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1753.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1813.cfg
index ff1ce9d3..ff1ce9d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1813.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1813.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1923.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1923.cfg
index f242e902..f242e902 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1923.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1923.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1966.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1966.cfg
index be3a873d..be3a873d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1966.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1966.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2020.cfg
index 2104e036..2104e036 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2045.cfg
index 3fb7cfe9..3fb7cfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2045.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2045.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2085.cfg
index 2df8ebd8..2df8ebd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2085.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2085.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2091.cfg
index 898b035b..898b035b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2101.cfg
index 44e5a0e6..44e5a0e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2149.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2149.cfg
index 721daf0b..721daf0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2149.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2149.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2150.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2150.cfg
index 5f518291..5f518291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2150.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2150.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2151.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2151.cfg
index 0660e498..0660e498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2151.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2151.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2163.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2163.cfg
index b7c31fe2..b7c31fe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2163.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2163.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2166.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2166.cfg
index 2b473436..2b473436 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2166.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2166.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2170.cfg
index f66f0022..f66f0022 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2186.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2186.cfg
index d694b699..d694b699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2186.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2186.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2195.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2195.cfg
index 0c70840d..0c70840d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2195.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2195.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2219.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2219.cfg
index 865142a1..865142a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2219.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2219.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2224.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2224.cfg
index 8973a14f..8973a14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2224.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2224.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2229.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2229.cfg
index 38cb5554..38cb5554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2229.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2229.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2232.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2232.cfg
index 06730341..06730341 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2232.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2232.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2236.cfg
index 6d30f256..6d30f256 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2236.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2250.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2250.cfg
index 705176b2..705176b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2250.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2250.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2281.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2281.cfg
index 1d8b164e..1d8b164e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2281.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2281.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2302.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2302.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2302.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2302.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2305.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2305.cfg
index 7200d9ac..7200d9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2305.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2305.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2319.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2319.cfg
index aeb132b5..aeb132b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2319.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2319.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2343.cfg
index 955a1f9a..955a1f9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2345.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2345.cfg
index 27213b45..27213b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2345.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2345.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2368.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2368.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2368.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2368.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2383.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2383.cfg
index 313d9efb..313d9efb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2383.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2383.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2386.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2386.cfg
index 3a121c2e..3a121c2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2386.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2386.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2428.cfg
index 8af28414..8af28414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2428.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2428.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2437.cfg
index b21679ce..b21679ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2437.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440_nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440_nl.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440_nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440_nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2478.cfg
index bb4425d9..bb4425d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2561.cfg
index 03a40504..03a40504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2561.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/Issue_2570.cfg
new file mode 100644
index 00000000..6a9f2d25
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2570.cfg
@@ -0,0 +1 @@
+mod_remove_extra_semicolon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2574.cfg
index d96f0980..d96f0980 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2582.cfg
index f634b12e..f634b12e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2582.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2582.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2591.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2591.cfg
index 6ca8934c..6ca8934c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2591.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2591.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2594.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2594.cfg
index 1d7941be..1d7941be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2594.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2594.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2596.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2596.cfg
index b6338859..b6338859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2596.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2596.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2604.cfg
index daeb9bc6..daeb9bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2604.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2604.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2668.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2668.cfg
index 40a69dcf..40a69dcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2668.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2668.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2688.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2688.cfg
index 4baf4b3f..4baf4b3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2688.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2688.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2689.cfg
index e498e830..e498e830 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2692.cfg
index bce2060e..bce2060e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/Issue_2703.cfg
new file mode 100644
index 00000000..ed7b8ddb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2703.cfg
@@ -0,0 +1,9 @@
+indent_columns                  = 4
+pp_multiline_define_body_indent = 4
+indent_with_tabs                = 0
+#Whether to align variable definitions in prototypes and functions.
+align_func_params               = true
+#The span for aligning parameter definitions in function on parameter name.
+#  0: Don't align (default).
+align_func_params_span          = 1
+sp_after_byref                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2734.cfg
index 83fdd868..83fdd868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2735.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2735.cfg
index 32a72aa2..32a72aa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2735.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2735.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2742.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2742.cfg
index eba0468c..eba0468c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2742.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2742.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2752.cfg
index e15e7702..e15e7702 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2757.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2757.cfg
index e2118df5..e2118df5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2757.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2757.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2758.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2758.cfg
index dd2d0f6b..dd2d0f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2758.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2758.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2759.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2759.cfg
index abdc53f4..abdc53f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2759.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2759.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2771.cfg
index b34e82a7..b34e82a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2794.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2794.cfg
index c193054f..c193054f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2794.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2794.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2795.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2795.cfg
index 353cafa8..353cafa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2795.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2795.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2823.cfg
index de58e056..de58e056 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2823.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2823.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2831.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2831.cfg
index e7271af0..e7271af0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2831.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2831.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2836.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2836.cfg
index 41151a57..41151a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2836.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2836.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2873.cfg
index be881c98..be881c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2873.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2873.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2879.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2879.cfg
index ba98f974..ba98f974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2879.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2879.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2886.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2886.cfg
index eb4b5ca2..eb4b5ca2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2886.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2886.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2890.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2890.cfg
index 81ba72ca..81ba72ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2890.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2890.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2902.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2902.cfg
index 5806b371..5806b371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2902.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2902.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2907.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2907.cfg
index fa5b3018..fa5b3018 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2907.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2907.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2914.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2914.cfg
index 98d4511c..98d4511c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2914.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2914.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2921.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2921.cfg
index 142dc8dc..142dc8dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2921.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2921.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2930.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2930.cfg
index bd8cb9b0..bd8cb9b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2930.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2930.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2942.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2942.cfg
index e72ddc77..e72ddc77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2942.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2942.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2949.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2949.cfg
index b5ea1ffb..b5ea1ffb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2949.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2949.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2957.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2957.cfg
index aaf2b1a1..aaf2b1a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2957.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2957.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2971.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2971.cfg
index 1255b541..1255b541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2971.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2971.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3010.cfg
index 5f518291..5f518291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3010.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3010.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3025.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3025.cfg
index 5e545c50..5e545c50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3025.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3025.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3034.cfg
index 77557ac3..77557ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3034.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3034.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3040.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3040.cfg
index 12c8ebaf..12c8ebaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3040.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3040.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3044.cfg
index c2f9ade5..c2f9ade5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3044.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3044.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3048.cfg
index fb4171d7..fb4171d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3048.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3048.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054-2.cfg
index a41640f0..a41640f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054.cfg
index a88303ba..a88303ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3055.cfg
index 307e5d93..ccf5c75f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3055.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3055.cfg
@@ -1,4 +1,4 @@
-pp_space       = force
+pp_space_after = force
 pp_space_count = 2
 
 # Whether to indent '#define' at the brace level. If false, these are
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3058.cfg
index 1619b851..1619b851 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3058.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3058.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_0nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_0nl.cfg
index 53a71184..53a71184 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_0nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_0nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_1nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_1nl.cfg
index ad1c0bbc..ad1c0bbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_1nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_1nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_2nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_2nl.cfg
index 27325b31..27325b31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_2nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_2nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_3nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_3nl.cfg
index 276c7d72..276c7d72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_3nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_3nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3080.cfg
index 748a6dad..748a6dad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3080.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3080.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3097.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3097.cfg
index ed31649e..ed31649e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3097.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3097.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3164.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3164.cfg
index 10cf639b..10cf639b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3164.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3164.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3197.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3197.cfg
index 2177bfff..2177bfff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3197.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3197.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3198.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3198.cfg
index 28852f24..28852f24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3198.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3198.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3203.cfg
index 69cd5054..69cd5054 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3203.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3203.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-f.cfg
index fffa496d..fffa496d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-i.cfg
index 52060d80..52060d80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-ir.cfg
index 17d298b2..17d298b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-r.cfg
index c62cb16e..c62cb16e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3237.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3237.cfg
index 5c47913d..5c47913d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3237.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3237.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3252.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3252.cfg
index db7fe8f2..db7fe8f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3252.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3252.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3284.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3284.cfg
index 51de787c..51de787c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3284.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3284.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3294.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3294.cfg
index 994a3fe7..994a3fe7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3294.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/Issue_3309-f.cfg
new file mode 100644
index 00000000..2c88f416
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-f.cfg
@@ -0,0 +1,2 @@
+sp_ellipsis_parameter_pack = force
+nl_collapse_empty_body_functions     = true
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.76.0/tests/config/cpp/Issue_3309-i.cfg
new file mode 100644
index 00000000..fc7534fe
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-i.cfg
@@ -0,0 +1,2 @@
+sp_ellipsis_parameter_pack = ignore
+nl_collapse_empty_body_functions     = true
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.76.0/tests/config/cpp/Issue_3309-r.cfg
new file mode 100644
index 00000000..aa884661
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-r.cfg
@@ -0,0 +1,2 @@
+sp_ellipsis_parameter_pack = remove
+nl_collapse_empty_body_functions     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3316.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3316.cfg
index 901ad6e4..901ad6e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3316.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3316.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3357.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3357.cfg
index 3f3c5075..3f3c5075 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3357.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3357.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3409.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3409.cfg
index f82a74fc..b8424b25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3409.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3409.cfg
@@ -1,6 +1,6 @@
 indent_cpp_lambda_body = true

 indent_cpp_lambda_only_once = true

+indent_align_assign = false

 indent_columns = 4

 indent_with_tabs = 0

-indent_continue = 4

 indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3413.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3413.cfg
index 99a9f4a9..99a9f4a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3413.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3413.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3422-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-1.cfg
index 6c86f2db..6c86f2db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3422-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3422-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-2.cfg
index beb76fde..beb76fde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3422-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428.cfg
index d8796682..d9f9789c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428.cfg
@@ -1,7 +1,7 @@
 indent_cpp_lambda_body         = true

 indent_cpp_lambda_only_once    = true

+indent_align_assign            = false

 

 indent_columns = 4

 indent_with_tabs = 0

-indent_continue = 4

 indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_2.cfg
index 26e8a8ed..4e750218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_2.cfg
@@ -1,8 +1,8 @@
 indent_cpp_lambda_body         = true

 indent_cpp_lambda_only_once    = true

 indent_namespace               = true

+indent_align_assign            = false

 

 indent_columns = 4

 indent_with_tabs = 0

-indent_continue = 4

 indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_3.cfg
index b61cf6b5..c404d45b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_3.cfg
@@ -2,8 +2,8 @@ indent_cpp_lambda_body         = true
 indent_cpp_lambda_only_once    = true

 indent_namespace               = true

 indent_namespace_single_indent = true

+indent_align_assign            = false

 

 indent_columns = 4

 indent_with_tabs = 0

-indent_continue = 4

 indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_4.cfg
index e0f3a865..e3078665 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_4.cfg
@@ -1,7 +1,7 @@
 indent_cpp_lambda_body         = true

 indent_cpp_lambda_only_once    = false

+indent_align_assign            = false

 

 indent_columns = 4

 indent_with_tabs = 0

-indent_continue = 4

 indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_5.cfg
index 1d4c1f30..6d0a4c77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_5.cfg
@@ -1,8 +1,8 @@
 indent_cpp_lambda_body         = true

 indent_cpp_lambda_only_once    = false

 indent_namespace               = true

+indent_align_assign            = false

 

 indent_columns = 4

 indent_with_tabs = 0

-indent_continue = 4

 indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_6.cfg
index 6b139435..30b78a65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_6.cfg
@@ -2,8 +2,8 @@ indent_cpp_lambda_body         = true
 indent_cpp_lambda_only_once    = false

 indent_namespace               = true

 indent_namespace_single_indent = true

+indent_align_assign            = false

 

 indent_columns = 4

 indent_with_tabs = 0

-indent_continue = 4

 indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3446.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3446.cfg
index a66901cc..a66901cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3446.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3446.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3448.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3448.cfg
index 77619e74..77619e74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3448.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3448.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3513.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3513.cfg
index 34f93540..34f93540 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3513.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3513.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3546.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3546.cfg
index 56965ae8..56965ae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3546.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/Issue_3550.cfg
new file mode 100644
index 00000000..1a4502fa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3550.cfg
@@ -0,0 +1,7 @@
+indent_cpp_lambda_body      = true

+indent_cpp_lambda_only_once = true

+indent_align_assign         = false

+

+indent_columns     = 4

+indent_with_tabs   = 0

+indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3552.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3552.cfg
index f9a0eca8..f9a0eca8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3552.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/Issue_3558.cfg
new file mode 100644
index 00000000..7999dcbf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3558.cfg
@@ -0,0 +1,2 @@
+sp_before_byref  = remove
+indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3570.cfg
index f291c20d..f291c20d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3570.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3570.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3576-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-a.cfg
index 052cf16f..052cf16f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3576-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3576-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-b.cfg
index 2b187f20..2b187f20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3576-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3604.cfg
index 5806b371..5806b371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3604.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3604.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3710.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3710.cfg
new file mode 100644
index 00000000..46339ba3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3710.cfg
@@ -0,0 +1,3 @@
+sp_balance_nested_parens = true
+indent_member            = 2
+indent_member_single     = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3785.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3785.cfg
new file mode 100644
index 00000000..64f056a5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3785.cfg
@@ -0,0 +1,4 @@
+indent_columns           = 3
+indent_with_tabs         = 0
+align_var_def_span       = 2
+align_var_def_star_style = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.cfg
new file mode 100644
index 00000000..c5c081aa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.cfg
@@ -0,0 +1,4 @@
+sp_after_comma                  = add
+sp_inside_braces                = force
+indent_with_tabs                = 0
+align_struct_init_span          = 1
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.76.0/tests/config/cpp/Issue_3786.rerun.cfg
new file mode 100644
index 00000000..c514c32c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.rerun.cfg
@@ -0,0 +1 @@
+include Issue_3786.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.76.0/tests/config/cpp/Issue_3863.cfg
new file mode 100644
index 00000000..eb716a45
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3863.cfg
@@ -0,0 +1 @@
+nl_end_of_file = ignore

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_750.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_750.cfg
index b22aff36..b22aff36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_750.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_750.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_931.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_931.cfg
index 45879950..45879950 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_931.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_931.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_995-do.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_995-do.cfg
index ba4e6387..ba4e6387 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_995-do.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_995-do.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-f.cfg
index 8da1e530..8da1e530 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-r.cfg
index 329f5112..329f5112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/STUCK_macro-difficulties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/STUCK_macro-difficulties.cfg
index c7ce0fd8..c7ce0fd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/STUCK_macro-difficulties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/STUCK_macro-difficulties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U02-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U02-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U02-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U02-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U03-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U03-Cpp.cfg
index d0f33089..d0f33089 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U03-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U03-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U04-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U04-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U04-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U04-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U05-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U05-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U05-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U05-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U06-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U06-Cpp.cfg
index 55fcc716..55fcc716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U06-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U06-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U07-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U07-Cpp.cfg
index 9cee7fef..9cee7fef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U07-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U07-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U16-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U16-Cpp.cfg
index 425ee375..425ee375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U16-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U16-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U18-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U18-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U18-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U18-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U21-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U21-Cpp.cfg
index fd27114f..fd27114f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U21-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U21-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U23-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U23-Cpp.cfg
index 04863187..04863187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U23-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U23-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U25-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U25-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U25-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U25-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U26-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U26-Cpp.cfg
index 39c58934..39c58934 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U26-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U26-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U27-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U27-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U27-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U27-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U28-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U28-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U28-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U28-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U29-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U29-Cpp.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U29-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U29-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U30-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U30-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U30-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U30-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U31-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U31-Cpp.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U31-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U31-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U33-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U33-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U33-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U33-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U36-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U36-Cpp.cfg
index b655be2c..b655be2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U36-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U36-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-10496.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-10496.cfg
index 42f6ee64..42f6ee64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-10496.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-10496.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-12046.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-12046.cfg
index 4dcd62eb..4dcd62eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-12046.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-12046.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1340.cfg
index 8a43dca1..8a43dca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1344.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1344.cfg
index 9e9937d2..9e9937d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1344.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1344.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1346.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1346.cfg
index 4074ff52..4074ff52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1346.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1346.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1347.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1347.cfg
index ee4173ec..ee4173ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1347.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1347.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1350.cfg
index 082a647f..082a647f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1350.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1350.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1356.cfg
index 948f20b6..948f20b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1356.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1356.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1358.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1358.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1358.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1358.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2049.cfg
index f075ea03..f075ea03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2049.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2650.cfg
index 46279443..46279443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2650.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2680.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2680.cfg
index 99790699..99790699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2680.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2680.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-29935.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-29935.cfg
index 28d338ee..28d338ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-29935.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-29935.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-30088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-30088.cfg
index 4abe03e1..4abe03e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-30088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-30088.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-32657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-32657.cfg
index 91e21a06..775b6abb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-32657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-32657.cfg
@@ -242,7 +242,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Uncrustify.Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Uncrustify.Cpp.cfg
index 89855c3c..89855c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Uncrustify.Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Uncrustify.Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/al.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/al.cfg
index 669cef45..669cef45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/al.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/align-330.cfg
new file mode 100644
index 00000000..2b1e6107
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align-330.cfg
@@ -0,0 +1,8 @@
+sp_after_comma                  = force
+indent_columns                  = 3
+pp_multiline_define_body_indent = 3
+nl_class_colon                  = force
+align_nl_cont                   = true
+align_pp_define_gap             = 4
+align_pp_define_span            = 3
+indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-0.cfg
index fee6fea1..fee6fea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-1.cfg
index 2175c1e2..2175c1e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-2.cfg
index 9e3a2779..9e3a2779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_func_proto_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_func_proto_1.cfg
index 378039a7..378039a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_func_proto_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_func_proto_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_span-1.cfg
index fda177f9..fda177f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_asterisk_after_type_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
index 4a781152..4a781152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_class-constr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_class-constr.cfg
index 8824d97a..8824d97a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_class-constr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_class-constr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_continuation_left_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_continuation_left_shift.cfg
index 767f2adc..767f2adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_continuation_left_shift.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_continuation_left_shift.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_default_after_override.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_default_after_override.cfg
index 7373e8d1..7373e8d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_default_after_override.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_default_after_override.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_eigen_comma_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_eigen_comma_init.cfg
index a798cc5f..a798cc5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_eigen_comma_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_eigen_comma_init.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall-2.cfg
index 795a16e9..795a16e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall.cfg
index 2df9b2e0..2df9b2e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params-t.cfg
index 6072ca53..6072ca53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_gap.cfg
index 314c2e1b..314c2e1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_span-1.cfg
index 5695e5a4..5695e5a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_1.cfg
index acae1cc7..acae1cc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_2.cfg
index 355705f1..355705f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_3.cfg
index 48912fce..48912fce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_4.cfg
index 284a5ee8..284a5ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_1.cfg
index b6a93b5b..b6a93b5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_2.cfg
index 363ea06c..363ea06c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_3.cfg
index 3a5ac106..3a5ac106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_4.cfg
index 6b084d86..6b084d86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_5.cfg
index 8a8dff6b..8a8dff6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_right_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_right_comment.cfg
index 1551b394..1551b394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_right_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_right_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_class_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_class_span-1.cfg
index a1b4122c..a1b4122c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_class_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_class_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_1.cfg
index 5cadc402..5cadc402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_2.cfg
index bb9be8ad..bb9be8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_3.cfg
index edb77f43..edb77f43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/anonymous_enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/anonymous_enum.cfg
index 503a2cb5..503a2cb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/anonymous_enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/anonymous_enum.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/arith-vs-byref.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/arith-vs-byref.cfg
index 006060ca..006060ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/arith-vs-byref.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/arith-vs-byref.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/arith-vs-ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/arith-vs-ptr.cfg
index 60c8d23c..60c8d23c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/arith-vs-ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/asm_block_pp.cfg
new file mode 100644
index 00000000..dd9eb164
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/asm_block_pp.cfg
@@ -0,0 +1,2 @@
+indent_columns                  = 8
+indent_ignore_asm_block         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon.cfg
index aef9ed44..aef9ed44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon2.cfg
index 97783b66..97783b66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon3.cfg
index 30f50cb7..30f50cb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon4.cfg
index 1577d2b3..1577d2b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_001.cfg
index e1bce1fa..e1bce1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_003.cfg
index b6dffc7c..b6dffc7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_004.cfg
index fa3c13c3..fa3c13c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_005.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_005.cfg
index 6784d5f8..6784d5f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_005.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_005.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_006.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_006.cfg
index 2767d063..2767d063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_006.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_006.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_008.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_008.cfg
index 432f7093..ac567894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_008.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_008.cfg
@@ -3,7 +3,7 @@ sp_before_sparen                = force
 sp_inside_sparen                = remove
 indent_columns                  = 3
 indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_try_brace                    = add
 nl_catch_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_009.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_009.cfg
index 314bb848..314bb848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_009.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_009.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_010.cfg
index c4536db3..c4536db3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_010.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/ben_012.cfg
new file mode 100644
index 00000000..73c218c5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_012.cfg
@@ -0,0 +1,14 @@
+sp_arith                    = force
+sp_before_ptr_star          = force
+sp_after_ptr_star           = remove
+sp_before_byref             = remove
+sp_before_byref_func        = remove
+sp_inside_angle             = remove
+sp_after_angle              = force
+sp_angle_word               = force
+indent_columns              = 3
+indent_class                = true
+indent_access_spec          = 2
+nl_var_def_blk_end_func_top = 1
+nl_fdef_brace               = add
+mod_paren_on_return         = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_013.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_013.cfg
index be76962d..be76962d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_013.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_013.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_014.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_014.cfg
index 33c1e6e4..95250f61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_014.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_014.cfg
@@ -25,7 +25,7 @@ sp_after_dc                     = remove
 indent_columns                  = 3
 indent_class                    = true
 indent_access_spec              = 2
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_struct_brace                 = add
 nl_fdef_brace                   = add
 nl_after_brace_open             = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_015.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_015.cfg
index 0e139678..0e139678 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_015.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_015.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_016.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_016.cfg
index 9b863f1d..9b863f1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_016.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_016.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_017.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_017.cfg
index a4acecc3..a4acecc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_017.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_017.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_018.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_018.cfg
index c8dd1ab6..c8dd1ab6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_018.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_018.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_020.cfg
index 8cd270ef..8cd270ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_021.cfg
index e8024afb..e8024afb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_022.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_022.cfg
index e258b9a3..e258b9a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_022.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_022.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_023.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_023.cfg
index acb9b682..acb9b682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_023.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_023.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_024.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_024.cfg
index 37954be0..37954be0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_024.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_024.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_026.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_026.cfg
index f7008ee3..f7008ee3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_026.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_026.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_027.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_027.cfg
index fbbdb06a..fbbdb06a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_027.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_027.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_028.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_028.cfg
index 62848095..62848095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_028.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_028.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_029.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_029.cfg
index a0c2e18c..a0c2e18c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_029.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_029.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_030.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_030.cfg
index 8663afd4..8663afd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_030.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_030.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_031.cfg
index fe2182c9..fe2182c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_031.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_031.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1001.cfg
index d8255ca7..d8255ca7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1003.cfg
index 242b3a13..242b3a13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1004.cfg
index f479bada..f479bada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1020.cfg
index 51643e87..51643e87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1108.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1108.cfg
index 741ba79d..741ba79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1108.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1108.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1160.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1160.cfg
index afc7030d..afc7030d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1160.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1160.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1161.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1161.cfg
index c7977cf0..c7977cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1161.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1161.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1169.cfg
index 0615b330..0615b330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1169.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1169.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1170.cfg
index 9171180b..9171180b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1236.cfg
index 0c60d5be..0c60d5be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1236.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1296-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-F.cfg
index 613f85d5..613f85d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1296-F.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-F.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1296-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-T.cfg
index 82a970ff..82a970ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1296-T.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-T.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1315.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1315.cfg
index 49a716d0..49a716d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1315.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1315.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1324.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1324.cfg
index 289ca9d5..289ca9d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1324.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1324.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1340.cfg
index 6ec6568e..6ec6568e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1349.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1349.cfg
index abe4253c..abe4253c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1349.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1349.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1395.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1395.cfg
index c2bed595..c2bed595 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1395.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1395.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1402.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1403.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1403.cfg
index 8e10acd4..8e10acd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1403.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1403.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1432.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1432.cfg
index 4ae27492..4ae27492 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1432.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1432.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1439.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1439.cfg
index f625249d..f625249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1439.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1439.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1452.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1452.cfg
index dbd0e9b4..dbd0e9b4 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1452.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1452.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1649.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1649.cfg
index 472975ab..472975ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1649.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1649.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1689.cfg
index 7c1462f1..7c1462f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1691.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1691.cfg
index 03600f80..03600f80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1691.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1691.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1717.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1717.cfg
index a6c7322f..a6c7322f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1717.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1717.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1758-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1758-f.cfg
index 90d17ebd..90d17ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1758-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1758-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1854.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1854.cfg
index ebc5c5e3..ebc5c5e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1854.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1854.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1862.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1862.cfg
index c23b9027..c23b9027 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1862.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1862.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2285.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2285.cfg
index fa3b437b..fa3b437b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2285.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2285.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2322.cfg
index a16bec3d..a16bec3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2322.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2371.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2371.cfg
index 1f207beb..1f207beb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2371.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2371.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2402.cfg
index 85c3a458..85c3a458 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_1.cfg
index 17fd04a4..17fd04a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_2.cfg
index 89f0b916..89f0b916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_472.cfg
index 68d6f99b..68d6f99b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_472.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_472.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_488.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_488.cfg
index 0319ef54..0319ef54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_488.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_488.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_633.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_633.cfg
index 61833884..61833884 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_633.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_633.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_657.cfg
index 109e3750..109e3750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_657.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_664.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_664.cfg
index 3799bd89..3799bd89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_664.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_664.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_670.cfg
index fe57c0af..fe57c0af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-f.cfg
index 1f03334a..1f03334a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-r.cfg
index 82e3cb22..82e3cb22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_322.cfg
index e49770be..e49770be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_322.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_359.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_359.cfg
index ab9c63fb..ab9c63fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_359.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_359.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_405.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_405.cfg
index 0bdfce99..0bdfce99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_405.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_405.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-create.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-create.cfg
index ec0f6ca4..ec0f6ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-create.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-create.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-split.cfg
index 9e272905..9e272905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_478.cfg
index 18db9a6d..18db9a6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_663.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_663.cfg
index 9d780855..9d780855 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_663.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_663.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_666.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_666.cfg
index 6acabd49..6acabd49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_666.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_666.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_752.cfg
index 93191dc0..93191dc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-center.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-center.cfg
index 5d370736..5d370736 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-center.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-center.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-f.cfg
index a50d0c1a..a50d0c1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-i.cfg
index 9d15782c..9d15782c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-ir.cfg
index df89f6e3..df89f6e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-left.cfg
index d28c4e5e..d28c4e5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-r.cfg
index 505f9dc0..505f9dc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-right.cfg
index 82fb7287..82fb7287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cast.cfg
index feac5350..feac5350 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol-add.cfg
index fb14545e..64c29340 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol-add.cfg
@@ -8,4 +8,5 @@ nl_class_colon                  = add
 nl_constr_colon                 = add
 pos_class_comma                 = trail
 pos_constr_comma                = trail
-pos_constr_colon                = trail
\ No newline at end of file
+pos_constr_colon                = trail
+pp_indent_with_tabs             = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol.cfg
index ddb0e11b..cf80d3f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol.cfg
@@ -4,4 +4,5 @@ sp_after_dc                     = remove
 indent_columns                  = 3
 indent_class_colon              = true
 indent_constr_colon             = true
-pos_constr_colon                = trail
\ No newline at end of file
+pos_constr_colon                = trail
+pp_indent_with_tabs             = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol-add.cfg
index 960dade0..dc967004 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol-add.cfg
@@ -5,6 +5,7 @@ sp_before_dc                    = remove
 sp_after_dc                     = remove
 sp_before_nl_cont               = force
 indent_columns                  = 3
+pp_multiline_define_body_indent = 3
 indent_class_colon              = true
 indent_constr_colon             = true
 nl_class_init_args              = add
@@ -14,4 +15,5 @@ nl_constr_colon                 = add
 pos_class_comma                 = trail
 pos_constr_comma                = trail
 pos_class_colon                 = lead
-pos_constr_colon                = lead
\ No newline at end of file
+pos_constr_colon                = lead
+pp_indent_with_tabs             = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol.cfg
index a57e30d3..bae3b53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol.cfg
@@ -4,4 +4,5 @@ indent_columns                  = 3
 indent_class_colon              = true
 indent_constr_colon             = true
 pos_class_colon                 = lead
-pos_constr_colon                = lead
\ No newline at end of file
+pos_constr_colon                = lead
+pp_indent_with_tabs             = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add.cfg
index d60ffa9b..d60ffa9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add2.cfg
index f8a35e0d..f8a35e0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-del.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-del.cfg
index b90f2f75..b90f2f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-del.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-del.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-on-colon-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-on-colon-indent.cfg
index 86fec34f..e21fbc7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-on-colon-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-on-colon-indent.cfg
@@ -13,4 +13,5 @@ nl_class_colon                  = remove
 nl_constr_colon                 = add
 pos_class_comma                 = lead
 pos_constr_comma                = lead
-pos_constr_colon                = lead_force
\ No newline at end of file
+pos_constr_colon                = lead_force
+pp_indent_with_tabs             = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
index 98b3bcf3..98b3bcf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_cpp_to_c-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
index 85c3fec8..85c3fec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-1.cfg
index 8d0a8a16..8d0a8a16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-2.cfg
index fd9b9d25..fd9b9d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-3.cfg
index c8e6ce41..c8e6ce41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
index e7d99a98..e7d99a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
index 0754b419..0754b419 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/code_width-70.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/code_width-70.cfg
index 07c25e5c..07c25e5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/code_width-70.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/code_width-70.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-f.cfg
index 29eb50b5..29eb50b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-i.cfg
index 2dad1026..2dad1026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-r.cfg
index 5194e6da..5194e6da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/const_throw.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/const_throw.cfg
index 41b3ecef..41b3ecef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/const_throw.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/const_throw.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/constr_colon.cfg
index 3397573a..3397573a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cpp17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cpp17.cfg
index 1865e0c8..1865e0c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cpp17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cpp17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cu.cfg
index 40dff3e5..40dff3e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open.cfg
index 5b4539e2..5b4539e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open2.cfg
index 38e507b5..38e507b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/disable_nl_cont.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/disable_nl_cont.cfg
index 9ea9350f..f80605fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/disable_nl_cont.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/disable_nl_cont.cfg
@@ -3,4 +3,4 @@ sp_compare                    = force
 sp_assign                     = force
 sp_arith                      = force
 indent_class                  = true
-sp_before_nl_cont             = ignore
\ No newline at end of file
+sp_before_nl_cont             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-detab-strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-detab-strings.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-detab-strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-detab-strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-process-defines.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-process-defines.cfg
index bfb66ec8..051f834f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-process-defines.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-process-defines.cfg
@@ -1,2 +1,3 @@
 indent_columns                  = 4
+pp_multiline_define_body_indent = 4
 set                             = WORD                         define
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/eat_blanks_after_codewidth.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
index 1b24a7ac..1b24a7ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ellipsis-i.cfg
index 3b4d8ec6..3b4d8ec6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum.cfg
index b39c0840..b39c0840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-3.cfg
index 7fe548e2..7fe548e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-4.cfg
index d42e6b1e..d42e6b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-6.cfg
index 6d4279ec..6d4279ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comment_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comment_wrap.cfg
index e42e00a1..e42e00a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comment_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comment_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/extern_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/extern_func.cfg
index a6135e8a..a6135e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/extern_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/extern_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/footer.txt
index 1d2f941f..1d2f941f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_class.cfg
index 7f01b7be..7f01b7be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_param.cfg
index 9162fd6d..9162fd6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/functype_param-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/functype_param-f.cfg
index a870e0c5..a870e0c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/functype_param-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/functype_param-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/functype_param-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/functype_param-r.cfg
index 9b70479a..9b70479a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/functype_param-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/i1516.cfg
new file mode 100644
index 00000000..9d8433d8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1516.cfg
@@ -0,0 +1,4 @@
+nl_var_def_blk_end_func_top = 2
+nl_var_def_blk_start        = 1
+nl_var_def_blk_end          = 2
+nl_var_def_blk_in           = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.cfg
index 5506f68c..5506f68c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.txt
index d34c497d..d34c497d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1768.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1768.cfg
index 9174483a..9174483a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1768.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1768.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i683.cfg
index 2b6edefe..2b6edefe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i683.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/if_chain_braces_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/if_chain_braces_2.cfg
index 6547c095..6547c095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/if_chain_braces_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/if_chain_braces_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_braces_no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_braces_no.cfg
index 24ca060b..24ca060b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_braces_no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_braces_no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t.cfg
index 78320e8a..78320e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t_columns-4.cfg
index 5184fc9a..5184fc9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-11.cfg
index 15cef67e..15cef67e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-2.cfg
index f33cb665..f33cb665 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-4.cfg
index f4f5183a..f4f5183a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_comma_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comma_brace.cfg
index 19c3b161..19c3b161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_comma_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comma_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_comment_align_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
index 2f5d5cab..2f5d5cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init.cfg
index cb1cef12..cb1cef12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_following.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_following.cfg
index 140e8f17..140e8f17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_following.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_following.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_leading.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_leading.cfg
index ce8fb22f..ce8fb22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_leading.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_leading.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_members_twice.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_members_twice.cfg
index 82c708d4..82c708d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_members_twice.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_members_twice.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_else_if-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_else_if-t.cfg
index 2dcd9a57..2dcd9a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_else_if-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_else_if-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_first_for_expr-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_first_for_expr-t.cfg
index ff68e85c..ff68e85c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_first_for_expr-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_first_for_expr-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_func_proto_param-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_func_proto_param-t.cfg
index 04301ff7..04301ff7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_func_proto_param-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_func_proto_param-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
index 6564f4d0..6564f4d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
index 6e9fa193..6e9fa193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace-t.cfg
index 90bbdaec..90bbdaec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace_inner_only.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_inner_only.cfg
index bb715758..bb715758 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace_inner_only.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_inner_only.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace_single_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_single_indent.cfg
index 9f66fea4..9f66fea4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace_single_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_single_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_off_after_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_off_after_return.cfg
index 077c5f94..077c5f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_off_after_return.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_off_after_return.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_once.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_once.cfg
index 013985b9..013985b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_once.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_once.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_param.cfg
index 07d98897..07d98897 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_call-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
index eafffebc..eafffebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
index c4db2ffe..c4db2ffe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_def-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
index 5d2895e9..5d2895e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_0.cfg
index b14f0bc5..b14f0bc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_1.cfg
index 06795707..06795707 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_2.cfg
index b78b2995..b78b2995 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
index 6b49dbd6..6b49dbd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_shift.cfg
index 481d7d07..481d7d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_shift.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_shift.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_var_def_cont-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_var_def_cont-t.cfg
index f439a00b..f439a00b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_var_def_cont-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_var_def_cont-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_with_tabs-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_with_tabs-0.cfg
index bd2c3a08..bd2c3a08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_with_tabs-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_with_tabs-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/initlist_leading_commas.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/initlist_leading_commas.cfg
index ebd35547..ebd35547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/initlist_leading_commas.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/initlist_leading_commas.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/interface-keyword-in-cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/interface-keyword-in-cpp.cfg
index cbbf215b..cbbf215b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/interface-keyword-in-cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/interface-keyword-in-cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1778.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1778.cfg
index 2f4bd642..2f4bd642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1778.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1778.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1782.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1782.cfg
index 6d50bfeb..6d50bfeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1782.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1782.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1804.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1804.cfg
index 4c424b89..4c424b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1804.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1804.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1887.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1887.cfg
index 956ea6a9..956ea6a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1887.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1887.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1916.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1916.cfg
index 414a4a96..414a4a96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1916.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1916.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1985.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1985.cfg
index 3be58c29..3be58c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1985.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1985.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1997.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1997.cfg
index 1f79d36e..1f79d36e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1997.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1997.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2124-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-1.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2124-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2124-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-2.cfg
index 37eeb5f2..37eeb5f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2124-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2209.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2209.cfg
index 414a7273..414a7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2209.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2209.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_1.cfg
index 56ab3a56..56ab3a56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_2.cfg
index 2848fb59..2848fb59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_3.cfg
index 52d17555..52d17555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116-2.cfg
index f26ef61e..f26ef61e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116.cfg
index 034f2697..034f2697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3378.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3378.cfg
index 8ecc9f2f..8ecc9f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3378.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3378.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_564.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-a.cfg
index 24a1a182..24a1a182 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-b.cfg
index b61ac3e2..b61ac3e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-i.cfg
index c0177cb1..c0177cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574.cfg
index 925ee5fe..925ee5fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim2.cfg
index 18b12bbe..18b12bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim3.cfg
index 0fe42133..0fe42133 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim5.cfg
index 56a1b3da..56a1b3da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda1.cfg
index c0fbc795..c0fbc795 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda2.cfg
index 9f698209..9f698209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda3.cfg
index ffed35eb..ffed35eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda4.cfg
index 63a99010..63a99010 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda_in_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda_in_one_liner.cfg
index 7b61e767..7b61e767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda_in_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda_in_one_liner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Mac.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Mac.cfg
index d8b41944..d8b41944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Mac.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Mac.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Unix.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Unix.cfg
index e6cf9411..e6cf9411 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Unix.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Unix.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Win.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Win.cfg
index cb40d365..cb40d365 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Win.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Win.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_br_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/long_br_cmt.cfg
index f66ee7c7..f66ee7c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_br_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/long_br_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_namespace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/long_namespace.cfg
index 74f99a18..74f99a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_namespace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/mod_add_long_class_closebrace_comment.cfg
new file mode 100644
index 00000000..a3752ab8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_add_long_class_closebrace_comment.cfg
@@ -0,0 +1,2 @@
+mod_add_long_class_closebrace_comment = 1
+nl_after_class                        = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
index a94f5a62..a94f5a62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
index a0b0f5d3..a0b0f5d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
index c78f179b..c78f179b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
index dd552dd0..dd552dd0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
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.76.0/tests/config/cpp/mod_paren_on_throw-a.cfg
new file mode 100644
index 00000000..ca119beb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-a.cfg
@@ -0,0 +1 @@
+mod_paren_on_throw = add
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.76.0/tests/config/cpp/mod_paren_on_throw-f.cfg
new file mode 100644
index 00000000..b442438e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-f.cfg
@@ -0,0 +1 @@
+mod_paren_on_throw = force
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.76.0/tests/config/cpp/mod_paren_on_throw-i.cfg
new file mode 100644
index 00000000..517dfce3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-i.cfg
@@ -0,0 +1 @@
+mod_paren_on_throw = ignore
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.76.0/tests/config/cpp/mod_paren_on_throw-r.cfg
new file mode 100644
index 00000000..498b6b01
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-r.cfg
@@ -0,0 +1 @@
+mod_paren_on_throw = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_empty_return-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_empty_return-t.cfg
index 3e1bcd1f..3e1bcd1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_empty_return-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_empty_return-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
index 0f2d5246..0f2d5246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_1.cfg
index fe15ff0a..fe15ff0a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_10.cfg
index e5b917e8..e5b917e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_2.cfg
index b4063fd3..b4063fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_3.cfg
index d1c40d07..d1c40d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_4.cfg
index 651b4823..651b4823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_5.cfg
index 94140b21..94140b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_6.cfg
index 4fd7a077..4fd7a077 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_7.cfg
index 4ee5733c..4ee5733c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_8.cfg
index 5d6d9c63..5d6d9c63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_9.cfg
index be9a43e3..be9a43e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nSolve.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nSolve.cfg
index 6cc6fc27..6cc6fc27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nSolve.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nSolve.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/negative_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/negative_indent.cfg
index 39b1b007..39b1b007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/negative_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/negative_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_a.cfg
index d7501092..d7501092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_f.cfg
index 16784899..16784899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_paren_open_close.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_paren_open_close.cfg
index 789c7abe..789c7abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_paren_open_close.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_paren_open_close.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_r.cfg
index b72cd2ae..b72cd2ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl-brAfter-fcallParen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
index 6a83f800..6a83f800 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_access_spec.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_access_spec.cfg
index a5d98c44..a5d98c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_access_spec.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_access_spec.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body-2.cfg
index 9c9e7d57..9c9e7d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body.cfg
index 68633b6d..68633b6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_class_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
index 87b84e91..87b84e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto-3.cfg
index c9bc1f45..c9bc1f45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto_group-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
index 63fa256a..63fa256a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_assign_leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
index 6914813b..6914813b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_1.cfg
index 4146c6fb..4146c6fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_2.cfg
index bc1aaf83..bc1aaf83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_3.cfg
index 02daa843..02daa843 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-1.cfg
index 03ee374a..03ee374a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-2.cfg
index 2f3ba945..2f3ba945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
index 39539a4e..39539a4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
index d3ab2d68..d3ab2d68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_struct.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_struct.cfg
index ab325b19..ab325b19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_struct.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_struct.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_brace-a.cfg
index 25d3c271..25d3c271 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_brace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_brace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-f.cfg
index 0a731344..0a731344 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-r.cfg
index 5a749682..5a749682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_class-a.cfg
index 8c1eb70e..8c1eb70e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_class-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_class-r.cfg
index 29cc4dc6..29cc4dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
new file mode 100644
index 00000000..26ee0c73
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
@@ -0,0 +1,2 @@
+nl_fdef_brace                   = remove
+nl_collapse_empty_body_functions          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
index 7f08f9e3..7f08f9e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
index affe7156..affe7156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
index e64f7f0c..e64f7f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
index 9b12913e..9b12913e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
index bdcceefd..bdcceefd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
index 4d11891e..4d11891e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_empty-r.cfg
index da04d6fa..da04d6fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren-f.cfg
index 480ce89f..480ce89f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
index 48612eb5..48612eb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_class_scope-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_class_scope-a.cfg
index dc9b2ec5..dc9b2ec5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_class_scope-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_class_scope-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_1.cfg
index 438afe8f..6a7f8d9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_1.cfg
@@ -12,4 +12,4 @@ nl_func_decl_end                = remove
 nl_func_def_end                 = force
 nl_func_def_empty               = force
 nl_inside_empty_func            = 2
-nl_collapse_empty_body          = true # this option overrides nl_inside_empty_func
+nl_collapse_empty_body_functions = true # this option overrides nl_inside_empty_func
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_2.cfg
index c0495a4b..c0495a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
index ddc5e5d2..ddc5e5d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_paren_empty.cfg
index 63f0b8ad..63f0b8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_scope_name-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_scope_name-a.cfg
index c814477d..c814477d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_scope_name-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_scope_name-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name-r.cfg
index 9cc10873..9cc10873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_class.cfg
index fcb08501..fcb08501 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_force.cfg
index ef8b317e..ef8b317e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_mixed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_mixed.cfg
index 515400f2..515400f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_mixed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_mixed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_remove.cfg
index ee38dd7e..ee38dd7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_1.cfg
index c84309ca..c84309ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_2.cfg
index 9edefd02..9edefd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
index 9aa3416c..9aa3416c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
index 8d0bdf67..8d0bdf67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-a.cfg
index bc5d6469..bc5d6469 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-r.cfg
index ca9c198d..ca9c198d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
index 2d0c48b2..2d0c48b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_template-f.cfg
index a90d1500..a90d1500 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_template-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_template-r.cfg
index 443693e5..443693e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/nl_throw_expr-a.cfg
new file mode 100644
index 00000000..0a8e4192
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-a.cfg
@@ -0,0 +1 @@
+nl_throw_expr = add
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.76.0/tests/config/cpp/nl_throw_expr-f.cfg
new file mode 100644
index 00000000..406bd3ae
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-f.cfg
@@ -0,0 +1 @@
+nl_throw_expr = force
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.76.0/tests/config/cpp/nl_throw_expr-i.cfg
new file mode 100644
index 00000000..608f3065
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-i.cfg
@@ -0,0 +1 @@
+nl_throw_expr = ignore
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.76.0/tests/config/cpp/nl_throw_expr-r.cfg
new file mode 100644
index 00000000..80267701
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-r.cfg
@@ -0,0 +1 @@
+nl_throw_expr = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_try-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_try-a.cfg
index b85fcb08..b85fcb08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_try-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_try-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
index 1b29c5cd..1b29c5cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
index ef8d1de1..ef8d1de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
index 4e070657..4e070657 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
index d4834efd..d4834efd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
index 1e9289e4..1e9289e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
index 7d493c8b..7d493c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/no_squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/no_squeeze_ifdef.cfg
index af4a3020..af4a3020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/no_squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/no_squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-force.cfg
index 4feac69a..4feac69a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-1.cfg
index 5be45718..5be45718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-2.cfg
index 32b7687a..32b7687a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove.cfg
index 5424ede9..5424ede9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op_sym_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op_sym_empty.cfg
index d9a57ce1..d9a57ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op_sym_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op_sym_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-F.cfg
index 77d9e08c..77d9e08c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-F.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-F.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-T.cfg
index a48c3ebb..a48c3ebb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-T.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-T.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_assign.cfg
index 3b9c3700..3b9c3700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_assign.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_assign.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-lf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-lf.cfg
index 9f2daab6..9f2daab6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-lf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-lf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-tb.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-tb.cfg
index 3530982a..3530982a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-tb.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-tb.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_enum_comma-tf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_enum_comma-tf.cfg
index 26cf3dff..26cf3dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_enum_comma-tf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_enum_comma-tf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-join.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-join.cfg
index 69ce2c94..69ce2c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-join.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-join.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-lead.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-lead.cfg
index 08e7d5de..08e7d5de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-lead.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-lead.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-trail.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-trail.cfg
index a6b45298..a6b45298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-trail.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-trail.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp-pragma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp-pragma.cfg
index e143a69c..e143a69c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp-pragma.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp-pragma.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_define_at_level-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_define_at_level-1.cfg
index 12d12161..75f6a6a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_define_at_level-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_define_at_level-1.cfg
@@ -1,4 +1,5 @@
 indent_columns                  = 4
+pp_multiline_define_body_indent = 4
 indent_with_tabs                = 0
 indent_class                    = true
-pp_define_at_level              = true
\ No newline at end of file
+pp_define_at_level              = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_multi_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_multi_comment.cfg
index 0c23b380..0c23b380 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_multi_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_multi_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-1.cfg
index 34a504be..34a504be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-2.cfg
index 6af95864..6af95864 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-3.cfg
index 3a5ed163..3a5ed163 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/qt-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/qt-1.cfg
index b15663f7..b15663f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/qt-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/qt-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sef.cfg
index ee467d79..ee467d79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-f.cfg
index 0ffadc4a..0ffadc4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-i.cfg
index b4260607..b4260607 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-r.cfg
index a8465b8c..a8465b8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-f.cfg
index 46a15bac..46a15bac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-r.cfg
index 8f6c0f6d..8f6c0f6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.3315874.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.3315874.cfg
index 99da8446..99da8446 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.3315874.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.3315874.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf574.cfg
index 8fc266f7..8fc266f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sim.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sim.cfg
index a772734b..cb954233 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sim.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sim.cfg
@@ -3,6 +3,7 @@ sp_before_angle                 = remove
 sp_after_angle                  = remove
 sp_angle_word                   = remove
 indent_columns                  = 2
+pp_multiline_define_body_indent = 2
 indent_class                    = true
 nl_collapse_empty_body          = true
 nl_end_of_file                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-1.cfg
index cae5bbb7..cae5bbb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-2.cfg
index c14d7901..c14d7901 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-3.cfg
index d0428a10..d0428a10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-f.cfg
index d92ffb0d..d92ffb0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-r.cfg
index 130602eb..130602eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_constr_colon.cfg
index aa1189dd..aa1189dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-f.cfg
index 077c5f94..077c5f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-r.cfg
index 64a318a0..64a318a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ellipsis-f.cfg
index e30e169a..e30e169a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
index 7e26046f..7e26046f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type-i.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
index d3b744b4..d3b744b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
index f370b82e..f370b82e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_colon.cfg
index e247bbbe..e247bbbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren-f.cfg
index 0b3d2f92..0b3d2f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren_empty.cfg
index 1e3c592b..1e3c592b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith-a.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-f.cfg
index 8e6f0585..8e6f0585 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-r.cfg
index e01e86f7..e01e86f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_assign_default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_assign_default.cfg
index 29411834..29411834 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_assign_default.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_assign_default.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_balance_nested_parens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_balance_nested_parens.cfg
index 8e9dbb6f..8e9dbb6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_balance_nested_parens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_balance_nested_parens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_byref_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_byref_func.cfg
index 6f5e2783..6f5e2783 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_byref_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_byref_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_case_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_case_colon.cfg
index d0bef793..d0bef793 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_case_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_case_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_comma-f.cfg
index dc25e313..dc25e313 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_comma-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_comma-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_constr_colon.cfg
index 9d0ec317..9d0ec317 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-f.cfg
index ed701425..ed701425 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-r.cfg
index e2163788..e2163788 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-f.cfg
index 7653ec0b..7653ec0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-r.cfg
index 55f99c73..55f99c73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
index 834fd302..834fd302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
index 54720c71..54720c71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
index 3dda0281..3dda0281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
index 5fb0bf36..5fb0bf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-f.cfg
index b5a9e09f..b5a9e09f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-i.cfg
index ae79b0a8..ae79b0a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-r.cfg
index 3baee576..3baee576 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-f.cfg
index 090c2858..090c2858 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-r.cfg
index c652b3cd..c652b3cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_catch.cfg
index 7ee0209d..7ee0209d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_catch.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_catch.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-a.cfg
index f2c79e1a..f2c79e1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-f.cfg
index 8e7a167c..8e7a167c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-i.cfg
index 1ba244a9..1ba244a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-r.cfg
index fe59915e..fe59915e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_catch_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_catch_brace.cfg
index d2da6d91..d2da6d91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_catch_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_catch_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt.cfg
index fb7f6ef1..fb7f6ef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
index 1c626401..1c626401 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
index 67a0ff11..67a0ff11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-f.cfg
index dd6f0faf..dd6f0faf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-i.cfg
index d671d519..d671d519 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-ir.cfg
index 4a557554..4a557554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-r.cfg
index 0d013cf7..0d013cf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_constr_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_constr_colon-i.cfg
index c5cd823a..c5cd823a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_constr_colon-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_constr_colon-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cparen_oparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cparen_oparen-r.cfg
index f584c02d..f584c02d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cparen_oparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cparen_oparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
index f45270e7..f45270e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
index cda81b02..cda81b02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
index c64da54c..c64da54c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
index f632d9d6..f632d9d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
index 9c8e2748..9c8e2748 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
index 492af499..492af499 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
index cc067763..cc067763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
index a035f41e..a035f41e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
index cf703b2f..cf703b2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
index 55ac955d..55ac955d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
index e8525fe5..e8525fe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
index bcb937c3..bcb937c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_dc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_dc.cfg
index c9b14cc2..c9b14cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_dc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_dc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-f.cfg
index 3636cd02..3636cd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-r.cfg
index b11add96..b11add96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_endif_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_endif_cmt.cfg
index 13ddf4fe..13ddf4fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_endif_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_endif_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-f.cfg
index 37928822..37928822 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-i.cfg
index c30b6525..c30b6525 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-i.cfg
index d154830c..d154830c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-r.cfg
index 87f44474..87f44474 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon.cfg
index 27716eca..27716eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/sp_func_call_empty.cfg
new file mode 100644
index 00000000..3705267a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_call_empty.cfg
@@ -0,0 +1,13 @@
+sp_before_byref             = remove
+sp_before_byref_func        = remove
+sp_after_comma              = force
+sp_func_call_paren          = force
+sp_func_call_paren_empty    = remove
+sp_return_paren             = remove
+indent_columns              = 3
+nl_var_def_blk_end_func_top = 1
+nl_fcall_brace              = add
+nl_fdef_brace               = add
+align_func_params           = true
+align_var_def_star_style    = 1
+mod_paren_on_return         = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_call_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_call_paren.cfg
index c5f8927b..c5f8927b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_call_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/sp_func_class_empty.cfg
new file mode 100644
index 00000000..33c1faba
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_class_empty.cfg
@@ -0,0 +1,14 @@
+sp_before_byref             = remove
+sp_before_byref_func        = remove
+sp_after_comma              = force
+sp_func_call_paren          = force
+sp_func_call_paren_empty    = remove
+sp_func_class_paren_empty   = force
+sp_return_paren             = remove
+indent_columns              = 3
+nl_var_def_blk_end_func_top = 1
+nl_fcall_brace              = add
+nl_fdef_brace               = add
+align_func_params           = true
+align_var_def_star_style    = 1
+mod_paren_on_return         = add
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.76.0/tests/config/cpp/sp_func_def_empty.cfg
new file mode 100644
index 00000000..56a18ecd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_def_empty.cfg
@@ -0,0 +1,14 @@
+sp_before_byref             = remove
+sp_before_byref_func        = remove
+sp_after_comma              = force
+sp_func_def_paren_empty     = force
+sp_func_call_paren          = force
+sp_func_call_paren_empty    = remove
+sp_return_paren             = remove
+indent_columns              = 3
+nl_var_def_blk_end_func_top = 1
+nl_fcall_brace              = add
+nl_fdef_brace               = add
+align_func_params           = true
+align_var_def_star_style    = 1
+mod_paren_on_return         = add
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.76.0/tests/config/cpp/sp_func_proto_empty.cfg
new file mode 100644
index 00000000..2054965d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_proto_empty.cfg
@@ -0,0 +1,14 @@
+sp_before_byref             = remove
+sp_before_byref_func        = remove
+sp_after_comma              = force
+sp_func_proto_paren_empty   = force
+sp_func_call_paren          = force
+sp_func_call_paren_empty    = remove
+sp_return_paren             = remove
+indent_columns              = 3
+nl_var_def_blk_end_func_top = 1
+nl_fcall_brace              = add
+nl_fdef_brace               = add
+align_func_params           = true
+align_var_def_star_style    = 1
+mod_paren_on_return         = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
index f7b1b239..f7b1b239 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
index bd854828..bd854828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
index a56a9ecb..a56a9ecb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
index ca8a03a0..ca8a03a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparen-r.cfg
index 98f867f4..98f867f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparens-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparens-f.cfg
index b56756d1..b56756d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparens-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparens-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
index 72db534b..72db534b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
index c42436bf..c42436bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
index e352ee6c..e352ee6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
index ed72df5e..ed72df5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
index b0881eaf..b0881eaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
index cafaab52..cafaab52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_not_not.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_not_not.cfg
index 1c0335a4..1c0335a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_not_not.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_not_not.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-f.cfg
index 8f9206ab..8f9206ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-i.cfg
index f3d0f22d..f3d0f22d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-r.cfg
index 7e2fce85..7e2fce85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
index 3cc88128..3cc88128 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
index 093de258..093de258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
index 5971dfa8..5971dfa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_noexcept-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_noexcept-f.cfg
index 35e76a33..35e76a33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_noexcept-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_noexcept-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_qualifier-f.cfg
index f91f2aee..f91f2aee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-a.cfg
index 16e78850..16e78850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-f.cfg
index b37d9b03..b37d9b03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-i.cfg
index 80d2d26d..80d2d26d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-r.cfg
index b3d64b3f..b3d64b3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-f.cfg
index bdea1673..bdea1673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-r.cfg
index a2541527..a2541527 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-f.cfg
index 11637ca1..11637ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-r.cfg
index 8fbef0b8..8fbef0b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
index 853db73a..853db73a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
index 48871cc9..48871cc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
index 7d1c2068..7d1c2068 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
index 46dfb49d..46dfb49d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
index 2b7d0b44..2b7d0b44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
index 27953868..27953868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
index d5ce739d..d5ce739d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-f.cfg
index 611cd750..611cd750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-r.cfg
index 893c8782..893c8782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-f.cfg
index 9e1fe074..9e1fe074 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-r.cfg
index b26929ba..b26929ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
index 071f30d0..071f30d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
index f5078788..f5078788 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
index 2f0d5258..2f0d5258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
index 199dc1eb..199dc1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-f.cfg
index 888a68b0..888a68b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-i.cfg
index f6cb6d0c..f6cb6d0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-r.cfg
index bf831e30..bf831e30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-1.cfg
index 010876e0..010876e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-2.cfg
index de86218b..de86218b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-f.cfg
index e8e5f08a..e8e5f08a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-r.cfg
index 62324f98..62324f98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_force.cfg
index d9c53345..d9c53345 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_remove.cfg
index 3fd1fa26..3fd1fa26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/space_indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
index a454237c..a454237c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef.cfg
index fa3f980c..fa3f980c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef_top.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef_top.cfg
index 6b45f49a..6b45f49a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef_top.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef_top.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-1.cfg
index 6c9f5806..6c9f5806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-2.cfg
index dc1f45fc..dc1f45fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/string_replace_tab_chars-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/string_replace_tab_chars-t.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/string_replace_tab_chars-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/string_replace_tab_chars-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/tab-0-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/tab-0-11.cfg
index 96f745a3..96f745a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/tab-0-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/tab-0-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-force.cfg
index 852277ca..852277ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-ignore.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-ignore.cfg
index b5bbb248..b5bbb248 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-ignore.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-ignore.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-remove.cfg
index 5e20f3b5..5e20f3b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-i.cfg
index 25622a57..25622a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-r.cfg
index 7efd2a7d..7efd2a7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt.cfg
index 08ef987e..08ef987e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt2.cfg
index 0b9be532..0b9be532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt3.cfg
index d7f1f675..d7f1f675 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt4.cfg
index ccd7bb03..ccd7bb03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cpp/using-alias-in-define.cfg
new file mode 100644
index 00000000..6b0b5e8f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/using-alias-in-define.cfg
@@ -0,0 +1 @@
+sp_addr = force
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.76.0/tests/config/cpp/var_def_blks-1.cfg
new file mode 100644
index 00000000..14d063e4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-1.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_end_func_top             = 1
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.76.0/tests/config/cpp/var_def_blks-2.cfg
new file mode 100644
index 00000000..f2181cae
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-2.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_start            = 2
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.76.0/tests/config/cpp/var_def_blks-3.cfg
new file mode 100644
index 00000000..aa5db84e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-3.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_end              = 4
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.76.0/tests/config/cpp/var_def_blks-4.cfg
new file mode 100644
index 00000000..9e4414e9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-4.cfg
@@ -0,0 +1,2 @@
+nl_var_def_blk_end_func_top     = 1
+nl_var_def_blk_start            = 2
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.76.0/tests/config/cpp/var_def_blks-5.cfg
new file mode 100644
index 00000000..374da8c9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-5.cfg
@@ -0,0 +1,2 @@
+nl_var_def_blk_end_func_top     = 1
+nl_var_def_blk_end              = 4
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.76.0/tests/config/cpp/var_def_blks-6.cfg
new file mode 100644
index 00000000..96b054a3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-6.cfg
@@ -0,0 +1,2 @@
+nl_var_def_blk_start            = 2
+nl_var_def_blk_end              = 4
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.76.0/tests/config/cpp/var_def_blks-7.cfg
new file mode 100644
index 00000000..22bb40b2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-7.cfg
@@ -0,0 +1,3 @@
+nl_var_def_blk_end_func_top     = 1
+nl_var_def_blk_start            = 2
+nl_var_def_blk_end              = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/var_def_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_gap.cfg
index 3d77d117..3d77d117 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/var_def_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/wessex.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/wessex.cfg
index 77fc3303..77fc3303 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/wessex.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/wessex.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/615_nested_usings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/615_nested_usings.cfg
index ae152fd4..ae152fd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/615_nested_usings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/615_nested_usings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/620_getset-brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/620_getset-brace.cfg
index 8e5510d0..8e5510d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/620_getset-brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/620_getset-brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/625_where-constraints.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/625_where-constraints.cfg
index a6fa8175..a6fa8175 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/625_where-constraints.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/625_where-constraints.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/Issue_2705.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/Issue_2705.cfg
index 0a3ecb71..0a3ecb71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/Issue_2705.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/Issue_2705.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U-J.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U-J.cfg
index 21e55d74..21e55d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U-J.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U-J.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U01-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U01-Cs.cfg
index db379631..03d51601 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U01-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U01-Cs.cfg
@@ -236,7 +236,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U02-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U02-Cs.cfg
index c7d6aeda..c7d6aeda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U02-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U02-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U03-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U03-Cs.cfg
index 24961370..24961370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U03-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U03-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U04-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U04-Cs.cfg
index b331f6f8..b331f6f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U04-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U04-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U06-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U06-Cs.cfg
index 03c2c765..03c2c765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U06-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U06-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U07-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U07-Cs.cfg
index 81f320b8..6306e07e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U07-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U07-Cs.cfg
@@ -236,7 +236,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U08-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U08-Cs.cfg
index aeff4b58..b5f5cb08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U08-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U08-Cs.cfg
@@ -236,7 +236,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U09-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U09-Cs.cfg
index d74080d2..d74080d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U09-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U09-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U10-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U10-Cs.cfg
index 42254ddb..42254ddb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U10-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U10-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U11-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U11-Cs.cfg
index 70557c46..70557c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U11-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U11-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U13-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U13-Cs.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U13-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U13-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U15-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U15-Cs.cfg
index 5a700342..5a700342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U15-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U15-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11662.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11662.cfg
index 24cf86a8..24cf86a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11662.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11662.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11993.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11993.cfg
index 34cf0529..69092def 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11993.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11993.cfg
@@ -242,7 +242,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1288.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1288.cfg
index 3b6cf1b4..3b6cf1b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1288.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1288.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1338.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1338.cfg
index 0eef21b4..0eef21b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1338.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1338.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1343.cfg
index f5276e1f..f5276e1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-13955.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-13955.cfg
index d1c7c955..d1c7c955 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-13955.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-13955.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-14131.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-14131.cfg
index 7c5535ea..7c5535ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-14131.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-14131.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18437.cfg
index 340e06dd..a72d6cb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18437.cfg
@@ -241,7 +241,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18829.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18829.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18829.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18829.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1975.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1975.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1975.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1975.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1977.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1977.cfg
index 4563bfde..4563bfde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1977.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1977.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1978.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1978.cfg
index 2cf794e3..2cf794e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1978.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1978.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-19895.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-19895.cfg
index ac4012d1..ac4012d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-19895.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-19895.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2020.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2021.cfg
index 827d33e0..827d33e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-21730.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-21730.cfg
index 5443f32f..5443f32f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-21730.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-21730.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2684.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2684.cfg
index c048c827..c048c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2684.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2684.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2685.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2685.cfg
index 3f25a1fa..3f25a1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2685.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2685.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-29933.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-29933.cfg
index 2f136516..2f136516 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-29933.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-29933.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-30498_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-30498_2.cfg
index 8f635e72..8f635e72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-30498_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-30498_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-3083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-3083.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-3083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-3083.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-32658.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-32658.cfg
index 45ff959d..a0b747d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-32658.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-32658.cfg
@@ -242,7 +242,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-37241.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-37241.cfg
index 693b9a86..f4fe568b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-37241.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-37241.cfg
@@ -242,7 +242,7 @@ cmt_cpp_to_c=false                                  # { False, True }
 cmt_star_cont=false                                 # { False, True }
 cmt_multi_check_last=false                          # { False, True }
 cmt_insert_before_preproc=false                     # { False, True }
-pp_space=ignore                                     # { Ignore, Add, Remove, Force }
+pp_space_after=ignore                                     # { Ignore, Add, Remove, Force }
 use_options_overriding_for_qt_macros=false          # { False, True }
 warn_level_tabs_found_in_verbatim_string_literals=1 # { 1, 2, 3 }
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-9917.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-9917.cfg
index f1fd0af3..f1fd0af3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-9917.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-9917.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_032.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_032.cfg
index e99f12ab..00575c6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_032.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_032.cfg
@@ -4,7 +4,7 @@ sp_func_call_paren              = remove
 indent_columns                  = 3
 indent_with_tabs                = 0
 indent_class                    = true
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_else_brace                   = add
 nl_for_brace                    = add
@@ -14,4 +14,4 @@ align_var_def_span              = 2
 align_assign_span               = 1
 mod_full_brace_for              = add
 mod_full_brace_if               = add
-mod_paren_on_return             = add
\ No newline at end of file
+mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_033.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_033.cfg
index 3f1ffc6c..3f1ffc6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_033.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_033.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_034.cfg
index 0681b1b8..0681b1b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_034.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_034.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_036.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_036.cfg
index 5a5f216b..ed89e06a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_036.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_036.cfg
@@ -1,6 +1,6 @@
 indent_columns                  = 3
 indent_with_tabs                = 0
 indent_class                    = true
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_try_brace                    = add
-nl_after_brace_close            = true
\ No newline at end of file
+nl_after_brace_close            = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_037.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_037.cfg
index 97daab41..97daab41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_037.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_037.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_038.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_038.cfg
index 4384cfbd..4384cfbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_038.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_038.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_043.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_043.cfg
index fcbc9ddc..fcbc9ddc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_043.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_043.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_044.cfg
index 6815087d..6815087d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_044.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/cs/ben_045.cfg
new file mode 100644
index 00000000..9419199e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_045.cfg
@@ -0,0 +1,7 @@
+sp_assign                   = force
+indent_columns              = 3
+indent_with_tabs            = 0
+indent_class                = true
+nl_var_def_blk_end_func_top = 1
+# Add or remove space around the '.' or '->;' operators. Default=Remove.
+sp_member                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1620.cfg
index 278e249b..a51f35fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1620.cfg
@@ -242,7 +242,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false

 cmt_multi_check_last=false

 cmt_insert_before_preproc=false

-pp_space=ignore

+pp_space_after=ignore

 use_options_overriding_for_qt_macros=false

 warn_level_tabs_found_in_verbatim_string_literals=1

 mod_add_long_ifdef_else_comment=0

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1637.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1637.cfg
index cf23e802..81291e9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1637.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1637.cfg
@@ -241,7 +241,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 mod_add_long_ifdef_else_comment=0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1650.cfg
index a3321b6b..9bcbfed5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1650.cfg
@@ -240,7 +240,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false

 cmt_multi_check_last=false

 cmt_insert_before_preproc=false

-pp_space=ignore

+pp_space_after=ignore

 use_options_overriding_for_qt_macros=false

 warn_level_tabs_found_in_verbatim_string_literals=1

 mod_add_long_ifdef_else_comment=0

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_600.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_600.cfg
index 5c47913d..5c47913d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_600.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_600.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_620.cfg
index 4486cd45..4486cd45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_620.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-f.cfg
index 6ea5a2af..6ea5a2af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-i.cfg
index f78c61b3..f78c61b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-r.cfg
index 626b6ff1..626b6ff1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/cs_generics.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/cs_generics.cfg
index e4320a80..e4320a80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/cs_generics.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/cs_generics.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/getset.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/getset.cfg
index 1e1ab8e9..1e1ab8e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/getset.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/getset.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent-multistring-coulmn1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent-multistring-coulmn1.cfg
index 8ce9a4ff..8ce9a4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent-multistring-coulmn1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent-multistring-coulmn1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_cs_delegate_brace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
index 9a4e6382..9a4e6382 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_using_block-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_using_block-f.cfg
index 2bfca802..2bfca802 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_using_block-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_using_block-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_a.cfg
index b05558b7..b05558b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_c.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_c.cfg
index 9bfcef37..9bfcef37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_c.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_c.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/misc-failures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/misc-failures.cfg
index 36b9e694..36b9e694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/misc-failures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/misc-failures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
index c187d46a..c187d46a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
index 13ebbd4a..13ebbd4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_paren_if_bool.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_paren_if_bool.cfg
index f75f8801..f75f8801 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_paren_if_bool.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_paren_if_bool.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_sort_using-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_sort_using-t.cfg
index 805fc734..805fc734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_sort_using-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_sort_using-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mono.cfg
index 726b1eda..64783953 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mono.cfg
@@ -3,5 +3,5 @@ sp_before_square                = add
 sp_func_call_paren              = force
 indent_with_tabs                = 0
 indent_class                    = true
-nl_func_var_def_blk             = 1
-nl_fdef_brace                   = add
\ No newline at end of file
+nl_var_def_blk_end_func_top     = 1
+nl_fdef_brace                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/new-constraint-paren-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/new-constraint-paren-space.cfg
index f96e03b6..f96e03b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/new-constraint-paren-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/new-constraint-paren-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sf607.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sf607.cfg
index ac5c0069..ac5c0069 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sf607.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sf607.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sort_using_categ.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sort_using_categ.cfg
index bf7f26e6..bf7f26e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sort_using_categ.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sort_using_categ.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_after_comma-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_after_comma-a.cfg
index 3f67ae0e..3f67ae0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_after_comma-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_after_comma-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_assign-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_assign-a.cfg
index 78ee09f5..78ee09f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_assign-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_assign-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_between_new_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_between_new_paren.cfg
index 0a338bd2..0a338bd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_between_new_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_between_new_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/squeeze-paren-close-Option.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/squeeze-paren-close-Option.cfg
index 9d4a4f70..9d4a4f70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/squeeze-paren-close-Option.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/squeeze-paren-close-Option.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/tcf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/tcf.cfg
index dd7fa193..dd7fa193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/tcf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/tcf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/verbatim_strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/verbatim_strings.cfg
index 65e1756d..65e1756d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/verbatim_strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/verbatim_strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/1438.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/1438.cfg
index 6973c22f..6973c22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/1438.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/1438.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d-tst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d-tst2.cfg
index db15aa59..db15aa59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d-tst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d-tst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-i.cfg
index b2f0f87a..b2f0f87a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-r.cfg
index 888247f8..888247f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2.cfg
index e7a7bca1..e3702fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2.cfg
@@ -21,7 +21,7 @@ indent_case_brace               = 4
 nl_start_of_file                = remove
 nl_end_of_file                  = force
 nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_enum_brace                   = remove
 nl_if_brace                     = remove
 nl_else_brace                   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3.cfg
index 53a311b0..4ce7da1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3.cfg
@@ -6,7 +6,8 @@ indent_columns                  = 4
 indent_with_tabs                = 0
 indent_label                    = 2
 nl_assign_square                = remove
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
+nl_var_def_blk_end              = 1
 nl_before_case                  = true
 eat_blanks_before_close_brace   = true
 align_var_def_span              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3a.cfg
index f3cf7bb8..c729c215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3a.cfg
@@ -7,7 +7,8 @@ indent_columns                  = 4
 indent_with_tabs                = 0
 indent_label                    = 2
 nl_assign_square                = force
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
+nl_var_def_blk_end              = 1
 nl_before_case                  = true
 eat_blanks_before_close_brace   = true
 align_var_def_span              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d_sp_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d_sp_paren.cfg
index 5b3443e6..5b3443e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d_sp_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d_sp_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/invariant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/invariant.cfg
index a462b4d0..a462b4d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/invariant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/invariant.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/libd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/libd.cfg
index a29c77a4..a29c77a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/libd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/libd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/sp_after_type-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/sp_after_type-a.cfg
index da7a3edb..da7a3edb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/sp_after_type-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/sp_after_type-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/ecma/ben_098.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/ecma/ben_098.cfg
index 9dddd073..bade1890 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/ecma/ben_098.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/ecma/ben_098.cfg
@@ -1,6 +1,6 @@
 sp_inside_paren                 = remove
 indent_columns                  = 3
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_fcall_brace                  = add
 align_right_cmt_span            = 3
-mod_paren_on_return             = add
\ No newline at end of file
+mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1122.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1122.cfg
index 8a152eda..8a152eda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1122.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1122.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-f.cfg
index bec692b6..bec692b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-r.cfg
index 1c610373..1c610373 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1845.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1845.cfg
index 5d339f68..5d339f68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1845.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1845.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_670.cfg
index 504b1d7d..504b1d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/annotation.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/annotation.cfg
index 0d800a82..0d800a82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/annotation.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/annotation.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/ben_099.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/ben_099.cfg
index 6cd10860..6cd10860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/ben_099.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/ben_099.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/doxy-javadoc-alignment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/doxy-javadoc-alignment.cfg
index 786a9ac7..786a9ac7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/doxy-javadoc-alignment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/doxy-javadoc-alignment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_foreach.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_foreach.cfg
index 56ec94cd..56ec94cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_foreach.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_foreach.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_1.cfg
index e57bba91..e57bba91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_2.cfg
index 3512cdc8..3512cdc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-f.cfg
index fde00f38..fde00f38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-r.cfg
index ed2a6942..ed2a6942 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/leading-tabs-for-java-lambda.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/leading-tabs-for-java-lambda.cfg
index ba1f063e..ba1f063e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/leading-tabs-for-java-lambda.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/leading-tabs-for-java-lambda.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
index c1e8e0ac..c1e8e0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_after_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_after_annotation-f.cfg
index 405f8ef4..405f8ef4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_after_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_after_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_between_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_between_annotation-f.cfg
index 6a67c354..6a67c354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_between_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_between_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/reflow_fold_regex.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/reflow_fold_regex.txt
index 9a24626f..9a24626f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/reflow_fold_regex.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/reflow_fold_regex.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_after_for_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_after_for_colon.cfg
index 70b19e50..70b19e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_after_for_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_after_for_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_this_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_this_paren.cfg
index fc80bb28..fc80bb28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_this_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_this_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/template_angles.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/template_angles.cfg
index 14680e53..14680e53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/template_angles.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/template_angles.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/1927.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/1927.cfg
index 3734f63d..3734f63d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/1927.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/1927.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3766.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3766.cfg
new file mode 100644
index 00000000..610168da
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3766.cfg
@@ -0,0 +1,3 @@
+sp_arith                        = force
+sp_before_ptr_star              = force
+sp_after_ptr_star               = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3767.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3767.cfg
new file mode 100644
index 00000000..8c30228c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3767.cfg
@@ -0,0 +1,11 @@
+input_tab_size                  = 2
+output_tab_size                 = 2
+sp_arith                        = force
+sp_assign                       = force
+sp_cpp_lambda_assign            = remove
+sp_cpp_lambda_square_paren      = remove
+sp_cpp_lambda_square_brace      = force
+sp_cpp_lambda_paren_brace       = force
+sp_cpp_lambda_fparen            = remove
+sp_after_ptr_star               = remove
+nl_cpp_lambda_leave_one_liners  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3811.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3811.cfg
new file mode 100644
index 00000000..20b7d2dc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3811.cfg
@@ -0,0 +1,3 @@
+mod_enum_last_comma             = force
+indent_with_tabs                = 0
+indent_columns                  = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3812.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3812.cfg
new file mode 100644
index 00000000..298c97d3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3812.cfg
@@ -0,0 +1,3 @@
+indent_switch_case = 2
+indent_with_tabs = 0
+indent_columns = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3813.cfg
new file mode 100644
index 00000000..298c97d3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3813.cfg
@@ -0,0 +1,3 @@
+indent_switch_case = 2
+indent_with_tabs = 0
+indent_columns = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3819.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3819.cfg
new file mode 100644
index 00000000..8e10acd4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3819.cfg
@@ -0,0 +1 @@
+sp_arith = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3823.cfg
new file mode 100644
index 00000000..fda2290c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3823.cfg
@@ -0,0 +1,2 @@
+indent_columns                  = 2
+indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_2172.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_2172.cfg
index a4da88d2..a4da88d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_2172.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_2172.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_681.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_681.cfg
index 901b0c8e..901b0c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_681.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_681.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U08-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U08-Cpp.cfg
index 1a8d9ead..1a8d9ead 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U08-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U08-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U09-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U09-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U09-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U09-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U10-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U10-Cpp.cfg
index 76c1c8c3..76c1c8c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U10-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U10-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U11-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U11-Cpp.cfg
index 07ba9e26..07ba9e26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U11-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U11-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U12-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U12-Cpp.cfg
index 581594ac..581594ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U12-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U12-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U13-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U13-Cpp.cfg
index 162b13d4..162b13d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U13-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U13-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U14-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U14-Cpp.cfg
index 967ea74d..967ea74d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U14-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U14-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U15-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U15-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U15-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U15-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U24-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U24-Cpp.cfg
index bc46ae54..cea571b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U24-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U24-Cpp.cfg
@@ -1,3 +1,4 @@
 input_tab_size                  = 4
 indent_columns                  = 4
 pp_ignore_define_body           = true
+pp_indent_with_tabs             = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/UNI-11095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/UNI-11095.cfg
index 805f779e..104bc385 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/UNI-11095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/UNI-11095.cfg
@@ -241,7 +241,7 @@ cmt_cpp_to_c=false
 cmt_star_cont=false
 cmt_multi_check_last=false
 cmt_insert_before_preproc=false
-pp_space=ignore
+pp_space_after=ignore
 use_options_overriding_for_qt_macros=false
 warn_level_tabs_found_in_verbatim_string_literals=1
 # blocked by https://sourceforge.net/p/uncrustify/bugs/619/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align-objc-like-xcode.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align-objc-like-xcode.cfg
index 3b321b11..3b321b11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align-objc-like-xcode.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/oc/align_colon_with_ternary_1.cfg
new file mode 100644
index 00000000..61ceb8ce
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_colon_with_ternary_1.cfg
@@ -0,0 +1 @@
+align_oc_msg_colon_span         = 1
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.76.0/tests/config/oc/align_colon_with_ternary_2.cfg
new file mode 100644
index 00000000..4496f3cb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_colon_with_ternary_2.cfg
@@ -0,0 +1,3 @@
+align_oc_msg_colon_span         = 1
+nl_oc_msg_args                  = true
+nl_oc_msg_args_min_params       = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align_oc_msg_colon_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
index 9681d152..9681d152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/block_pointer.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/block_pointer.cfg
index 70c21bbd..70c21bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/block_pointer.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/block_pointer.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/blocks.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/blocks.cfg
index 74ed7e4f..65a1c5e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/blocks.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/blocks.cfg
@@ -13,7 +13,7 @@ indent_with_tabs                = 0
 indent_oc_block                 = true
 nl_end_of_file                  = force
 nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_for_brace                    = add
 nl_while_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_167.cfg
index 6ed02f2e..6ed02f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_340.cfg
index f56e7a43..f56e7a43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_841.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_841.cfg
index 2ab54cc1..2ab54cc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_841.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_841.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_i_125-412.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_i_125-412.cfg
index 2498ac1b..2498ac1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_i_125-412.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_i_125-412.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/delete-space-oc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/delete-space-oc.cfg
index 4d8a15cb..4d8a15cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/delete-space-oc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/delete-space-oc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double-indent-objc-dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double-indent-objc-dict.cfg
index d4e9a1ae..d4e9a1ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double-indent-objc-dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double-indent-objc-dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_1.cfg
index 73319da9..73319da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_2.cfg
index 8d12b193..8d12b193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_3.cfg
index da6a41c2..da6a41c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh137.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh137.cfg
index 83da02ee..83da02ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh137.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh137.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.a.cfg
index e875a54b..e875a54b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.b.cfg
index 1dc357ae..1dc357ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent-objc-block.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent-objc-block.cfg
index aee5aace..aee5aace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent-objc-block.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent-objc-block.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_boxed.cfg
index e20f0820..e20f0820 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_oc_inside_msg_sel.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
index b140f071..b140f071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_single_newline.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_single_newline.cfg
index 1496b522..1496b522 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_single_newline.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_single_newline.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2643.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2643.cfg
index 7f188f21..7f188f21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2643.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2643.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2656.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2656.cfg
index 3b020c33..3b020c33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2656.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2656.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2675.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2675.cfg
index 0eab0244..0eab0244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2675.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2675.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_3031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_3031.cfg
index 8234c643..8234c643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_3031.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_3031.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
index d88bf262..d88bf262 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/oc/mod_sort_incl_import_grouping_enabled_with_regex.cfg
new file mode 100644
index 00000000..5724b52e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_grouping_enabled_with_regex.cfg
@@ -0,0 +1,11 @@
+mod_sort_import                 = true
+mod_sort_using                  = true
+mod_sort_include                = true
+mod_sort_incl_import_prioritize_angle_over_quotes = true
+mod_sort_incl_import_ignore_extension = true
+mod_sort_incl_import_grouping_enabled = true
+# All Apple Frameworks
+include_category_0 = "<Accelerate/.+|<Accessibility/.+|<Accounts/.+|<AddressBook/.+|<AddressBookUI/.+|<AdServices/.+|<AdSupport/.+|<AppClip/.+|<AppTrackingTransparency/.+|<ARKit/.+|<AssetsLibrary/.+|<AudioToolbox/.+|<AudioUnit/.+|<AuthenticationServices/.+|<AutomaticAssessmentConfiguration/.+|<AVFAudio/.+|<AVFoundation/.+|<AVKit/.+|<BackgroundTasks/.+|<BusinessChat/.+|<CallKit/.+|<CarPlay/.+|<CFNetwork/.+|<CHIP/.+|<ClassKit/.+|<ClockKit/.+|<CloudKit/.+|<Combine/.+|<Contacts/.+|<ContactsUI/.+|<CoreAudio/.+|<CoreAudioKit/.+|<CoreAudioTypes/.+|<CoreBluetooth/.+|<CoreData/.+|<CoreFoundation/.+|<CoreGraphics/.+|<CoreHaptics/.+|<CoreImage/.+|<CoreLocation/.+|<CoreLocationUI/.+|<CoreMedia/.+|<CoreMIDI/.+|<CoreML/.+|<CoreMotion/.+|<CoreNFC/.+|<CoreServices/.+|<CoreSpotlight/.+|<CoreTelephony/.+|<CoreText/.+|<CoreVideo/.+|<CreateML/.+|<CryptoKit/.+|<CryptoTokenKit/.+|<DataDetection/.+|<DeveloperToolsSupport/.+|<DeviceActivity/.+|<DeviceCheck/.+|<EventKit/.+|<EventKitUI/.+|<ExposureNotification/.+|<ExternalAccessory/.+|<FamilyControls/.+|<FileProvider/.+|<FileProviderUI/.+|<Foundation/.+|<GameController/.+|<GameKit/.+|<GameplayKit/.+|<GLKit/.+|<GroupActivities/.+|<GSS/.+|<HealthKit/.+|<HealthKitUI/.+|<HomeKit/.+|<iAd/.+|<IdentityLookup/.+|<IdentityLookupUI/.+|<ImageCaptureCore/.+|<ImageIO/.+|<Intents/.+|<IntentsUI/.+|<IOKit/.+|<IOSurface/.+|<JavaScriptCore/.+|<LinkPresentation/.+|<LocalAuthentication/.+|<ManagedSettings/.+|<ManagedSettingsUI/.+|<MapKit/.+|<MediaAccessibility/.+|<MediaPlayer/.+|<MediaSetup/.+|<MediaToolbox/.+|<Messages/.+|<MessageUI/.+|<Metal/.+|<MetalKit/.+|<MetalPerformanceShaders/.+|<MetalPerformanceShadersGraph/.+|<MetricKit/.+|<MLCompute/.+|<MobileCoreServices/.+|<ModelIO/.+|<MPSCore/.+|<MPSFunctions/.+|<MPSImage/.+|<MPSMatrix/.+|<MPSNDArray/.+|<MPSNeuralNetwork/.+|<MPSRayIntersector/.+|<MultipeerConnectivity/.+|<MusicKit/.+|<NaturalLanguage/.+|<NearbyInteraction/.+|<Network/.+|<NetworkExtension/.+|<NewsstandKit/.+|<NotificationCenter/.+|<OpenAL/.+|<OpenGLES/.+|<OSLog/.+|<PassKit/.+|<PDFKit/.+|<PencilKit/.+|<PHASE/.+|<Photos/.+|<PhotosUI/.+|<PushKit/.+|<QuartzCore/.+|<QuickLook/.+|<QuickLookThumbnailing/.+|<RealityFoundation/.+|<RealityKit/.+|<ReplayKit/.+|<SafariServices/.+|<SceneKit/.+|<ScreenTime/.+|<Security/.+|<SensorKit/.+|<ShazamKit/.+|<Social/.+|<SoundAnalysis/.+|<Speech/.+|<SpriteKit/.+|<StoreKit/.+|<SwiftUI/.+|<SystemConfiguration/.+|<TabularData/.+|<ThreadNetwork/.+|<Twitter/.+|<UIKit/.+|<UniformTypeIdentifiers/.+|<UserNotifications/.+|<UserNotificationsUI/.+|<vecLib/.+|<VideoSubscriberAccount/.+|<VideoToolbox/.+|<vImage/.+|<Vision/.+|<VisionKit/.+|<WatchConnectivity/.+|<WebKit/.+|<WidgetKit/.+"
+# All headers which are not "LowPriority" headers
+include_category_1 = "^((?!LowPriority\-\\d+\.h>).)*"
+# Remainder is implicity "LowPriority" headers
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
index d49491cb..d49491cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
index 475ab734..475ab734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
index aa9eb1db..aa9eb1db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
index 2661a68a..2661a68a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_after_func_body-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_after_func_body-3.cfg
index 65f1fa5a..65f1fa5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_after_func_body-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_after_func_body-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_brace_square.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_brace_square.cfg
index e0f11f90..60d2fb97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_brace_square.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_brace_square.cfg
@@ -10,7 +10,7 @@ sp_after_oc_block_caret         = remove
 indent_columns                  = 4
 indent_with_tabs                = 0
 indent_oc_block                 = true
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_for_brace                    = add
 nl_while_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
index e480140e..e480140e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_oc_block_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_block_brace-f.cfg
index 824fc747..824fc747 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_oc_block_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/oc/nl_oc_msg_args_max_code_width.cfg
new file mode 100644
index 00000000..197f0eb3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_msg_args_max_code_width.cfg
@@ -0,0 +1,5 @@
+nl_oc_msg_args                  = true
+nl_oc_msg_args_max_code_width   = 100
+indent_columns                  = 4
+indent_with_tabs                = 0
+align_oc_msg_colon_span         = 1
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.76.0/tests/config/oc/nl_oc_msg_args_min_params.cfg
new file mode 100644
index 00000000..d0d3f935
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_msg_args_min_params.cfg
@@ -0,0 +1,5 @@
+nl_oc_msg_args                  = true
+nl_oc_msg_args_min_params       = 4
+indent_columns                  = 4
+indent_with_tabs                = 0
+align_oc_msg_colon_span         = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-available.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-available.cfg
index f77790fc..f77790fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-available.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-available.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-properties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-properties.cfg
index 98241779..98241779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-properties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-properties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_bug_497.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_bug_497.cfg
index 0015f97d..0015f97d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_bug_497.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_bug_497.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_complex_method.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_complex_method.cfg
index 3e713117..8d82b960 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_complex_method.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_complex_method.cfg
@@ -2,6 +2,6 @@ sp_after_ptr_star               = force
 sp_after_oc_return_type         = force
 indent_columns                  = 4
 indent_with_tabs                = 0
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 align_oc_msg_colon_span         = 1
-cmt_star_cont                   = true
\ No newline at end of file
+cmt_star_cont                   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc1.cfg
index 659131cf..659131cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc10.cfg
index d50a20d8..d50a20d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc11.cfg
index e355d765..e355d765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc12.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc12.cfg
index 4f069fed..4f069fed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc12.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc12.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc13.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc13.cfg
index 925a2739..4466b37a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc13.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc13.cfg
@@ -3,7 +3,7 @@ sp_after_send_oc_colon          = force
 indent_columns                  = 3
 indent_continue                 = 3
 indent_align_assign             = false
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_fdef_brace                   = add
 nl_after_brace_open             = true
 align_var_def_span              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc14.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc14.cfg
index a44950db..a44950db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc14.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc14.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc16.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc16.cfg
index 5eec46e9..5eec46e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc16.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc16.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc17.cfg
index 18b27823..18b27823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc18.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc18.cfg
index 96003cf5..96003cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc18.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc18.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc19.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc19.cfg
index d68c95f0..d68c95f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc19.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc19.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc2.cfg
index 43d02a66..43d02a66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc4.cfg
index f2de050e..f2de050e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc5.cfg
index 77a7a7af..77a7a7af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc6.cfg
index c1bcd8d4..c1bcd8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc7.cfg
index 972ab19a..972ab19a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc8.cfg
index 3f577ab8..3f577ab8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc9.cfg
index 92ed39d4..92ed39d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1674.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1674.cfg
index 31e4537c..31e4537c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1674.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1674.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1683.cfg
index b5d4249d..b5d4249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1683.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_cond_colon.cfg
index b86516e0..b86516e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
index 817ec7c5..817ec7c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
index b2a79b8f..b2a79b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
index 98b6de42..98b6de42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
index 56e22330..e5e4fcdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
@@ -13,7 +13,7 @@ indent_with_tabs                = 0
 indent_oc_block                 = true
 nl_end_of_file                  = force
 nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_for_brace                    = add
 nl_while_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
index 516271f1..3194126d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
@@ -13,7 +13,7 @@ indent_with_tabs                = 0
 indent_oc_block                 = true
 nl_end_of_file                  = force
 nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_for_brace                    = add
 nl_while_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_add.cfg
index b321b9aa..b321b9aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_force.cfg
index fb8b9a1b..fb8b9a1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
index 1110a1eb..1110a1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_send_oc_colon-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
index 2a54dd6f..2a54dd6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_throw_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_throw_remove.cfg
index 6b6bc0ac..6b6bc0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_throw_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_throw_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
index 727fcf06..bd8863a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
@@ -12,7 +12,7 @@ indent_columns                  = 4
 indent_with_tabs                = 0
 nl_end_of_file                  = force
 nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_for_brace                    = add
 nl_while_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
index 37c6104a..2a001cbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
@@ -14,7 +14,7 @@ indent_with_tabs                = 0
 indent_oc_block                 = true
 nl_end_of_file                  = force
 nl_end_of_file_min              = 1
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_if_brace                     = add
 nl_for_brace                    = add
 nl_while_brace                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
index 3374e228..3374e228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
index 5be78fac..5be78fac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
index 9f93f4a5..9f93f4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument.cfg
index 60c651fb..60c651fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument2.cfg
index 8f297d7d..8f297d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument3.cfg
index 17059e47..17059e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument4.cfg
index 8caf60bc..8caf60bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument5.cfg
index 42e8c380..42e8c380 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_cond_ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_cond_ternary_short.cfg
index 564b2dcf..564b2dcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_cond_ternary_short.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_cond_ternary_short.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-i.cfg
index 5bb98ec2..5bb98ec2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-r.cfg
index f155e201..f155e201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_boxed.cfg
index 73939de1..73939de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-i.cfg
index 98e8f829..98e8f829 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-r.cfg
index 789e2872..789e2872 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch.cfg
index 7367541a..7367541a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_classname_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_classname_paren-r.cfg
index ba92279e..ba92279e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_classname_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_classname_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_synchronized.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_synchronized.cfg
index 5056f70f..5056f70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_synchronized.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_synchronized.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/ternary_short.cfg
index 55e708cf..55e708cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/ternary_short.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/ternary_short.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2586.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2586.cfg
index ff46f80d..ff46f80d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2586.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2586.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2665.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2665.cfg
index 763864c0..763864c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2665.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2665.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/amxmodx.cfg
index 2c87c362..95ca5a4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/amxmodx.cfg
@@ -7,6 +7,7 @@ sp_after_comma                  = force
 sp_inside_fparen                = remove
 sp_while_paren_open             = force
 indent_columns                  = 4
+pp_multiline_define_body_indent = 4
 nl_if_brace                     = add
 nl_else_brace                   = add
 align_with_tabs                 = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/mod_full_brace_function-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/mod_full_brace_function-f.cfg
index 8d44cc3b..8d44cc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/mod_full_brace_function-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/mod_full_brace_function-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn-escape.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn-escape.cfg
index 8d10ec23..8d10ec23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn-escape.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn-escape.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn.cfg
index 7859328a..7859328a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/staging/UNI-58354.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-58354.cfg
index fb9ca61b..fb9ca61b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/staging/UNI-58354.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-58354.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/staging/UNI-64325.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-64325.cfg
index 44ee8b48..44ee8b48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/staging/UNI-64325.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-64325.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/Issue_2090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2090.cfg
index 154cff70..154cff70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/Issue_2090.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2090.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/Issue_2270.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2270.cfg
index 43cc3757..43cc3757 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/Issue_2270.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2270.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_100.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_100.cfg
index 81cd4430..81cd4430 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_100.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_100.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_101.cfg
index 50078f96..50078f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_102.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_102.cfg
index 82fa033c..3a37ba17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_102.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_102.cfg
@@ -4,7 +4,7 @@ sp_func_call_paren              = remove
 indent_columns                  = 3
 indent_with_tabs                = 0
 indent_class                    = true
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_for_brace                    = add
 nl_fdef_brace                   = add
 align_var_def_span              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_103.cfg
index 3d212ad4..e7bc6b90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_103.cfg
@@ -5,7 +5,7 @@ sp_func_call_paren              = remove
 indent_columns                  = 3
 indent_with_tabs                = 0
 indent_class                    = true
-nl_func_var_def_blk             = 1
+nl_var_def_blk_end_func_top     = 1
 nl_for_brace                    = add
 nl_fdef_brace                   = add
 align_var_def_span              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_104.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_104.cfg
index 80870cfe..80870cfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_104.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_104.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_105.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_105.cfg
index 23452bfd..23452bfd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_105.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/vala/mda_space_a.cfg
new file mode 100644
index 00000000..b0a66bcb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/mda_space_a.cfg
@@ -0,0 +1,4 @@
+sp_after_comma                  = add
+sp_after_mdatype_commas         = force
+sp_before_mdatype_commas        = force
+sp_between_mdatype_commas       = force
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.76.0/tests/config/vala/mda_space_c.cfg
new file mode 100644
index 00000000..a8eaaaa2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/mda_space_c.cfg
@@ -0,0 +1,2 @@
+sp_after_comma                  = add
+sp_between_mdatype_commas       = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/nullable.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/nullable.cfg
index 5c47913d..5c47913d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/nullable.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/config/vala/sp_after_comma-a.cfg
new file mode 100644
index 00000000..35ee933a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/sp_after_comma-a.cfg
@@ -0,0 +1 @@
+sp_after_comma                  = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cpp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cpp.test
index e096efed..cdd407d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cpp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cpp.test
@@ -159,6 +159,8 @@
 30138  cpp/Issue_3513.cfg                                   cpp/Issue_3513-1.cpp
 30139  cpp/Issue_3604.cfg                                   cpp/Issue_3604.cpp
 
+30140  cpp/Issue_3785.cfg                                   cpp/Issue_3785.cpp
+
 30200  cpp/bug_1862.cfg                                     cpp/bug_1862.cpp
 30201  cpp/cmt_indent-1.cfg                                 cpp/cmt_indent.cpp
 30202  cpp/cmt_indent-2.cfg                                 cpp/cmt_indent.cpp
@@ -178,6 +180,7 @@
 30215  common/empty.cfg                                     cpp/Issue_2099.cpp
 30216  cpp/Issue_2302.cfg                                   cpp/Issue_2302.cpp
 30217  common/empty.cfg                                     cpp/2138.cpp
+30218  cpp/Issue_3710.cfg                                   cpp/Issue_3710.cpp
 
 30220  cpp/bug_1340.cfg                                     cpp/bug_1340.cpp
 30221  cpp/Issue_2914.cfg                                   cpp/Issue_2914.cpp
@@ -210,6 +213,7 @@
 
 30250  cpp/align_fcall.cfg                                  cpp/align_fcall.cpp
 30251  cpp/align_fcall-2.cfg                                cpp/align_fcall.cpp
+30252  common/empty.cfg                                     cpp/Issue_3691.h
 30253  common/empty.cfg                                     cpp/align_left_shift.cpp
 30254  common/empty.cfg                                     cpp/align_left_shift2.cpp
 30255  cpp/ben_018.cfg                                      cpp/align_constr.cpp
@@ -243,6 +247,8 @@
 30283  common/empty.cfg                                     cpp/Issue_3321.h
 30284  cpp/Issue_2957.cfg                                   cpp/Issue_2957.cpp
 30285  cpp/Issue_2971.cfg                                   cpp/Issue_2971.cpp
+30286  cpp/Issue_3558.cfg                                   cpp/Issue_3558.cpp
+30287! cpp/Issue_3786.cfg                                   cpp/Issue_3786.cpp
 
 30290  cpp/indent_shift.cfg                                 cpp/align_left_shift.cpp
 30291  cpp/indent_shift.cfg                                 cpp/indent_shift.cpp
@@ -488,7 +494,7 @@
 30971  cpp/Issue_2224.cfg                                   cpp/Issue_2224.cpp
 30972  cpp/Issue_2229.cfg                                   cpp/Issue_2229.cpp
 30973  cpp/Issue_2236.cfg                                   cpp/Issue_2236.cpp
-30974  common/empty.cfg                                     cpp/using-alias-in-define.cpp
+30974  cpp/using-alias-in-define.cfg                        cpp/using-alias-in-define.cpp
 
 31000  common/empty.cfg                                     cpp/digraph.cpp
 31001  cpp/ben_030.cfg                                      cpp/digraph.cpp
@@ -563,8 +569,15 @@
 31636  cpp/Issue_1923.cfg                                   cpp/Issue_1923.cpp
 31637  cpp/Issue_3446.cfg                                   cpp/Issue_3446.cpp
 
-31660  cpp/nl_func_var_def_blk-1.cfg                        cpp/issue_1919.cpp
+31660  cpp/var_def_blks-1.cfg                               cpp/issue_1919.cpp
 31661  cpp/Issue_3097.cfg                                   cpp/Issue_3097.cpp
+31662  cpp/var_def_blks-1.cfg                               cpp/var_def_blks.cpp
+31663  cpp/var_def_blks-2.cfg                               cpp/var_def_blks.cpp
+31664  cpp/var_def_blks-3.cfg                               cpp/var_def_blks.cpp
+31665  cpp/var_def_blks-4.cfg                               cpp/var_def_blks.cpp
+31666  cpp/var_def_blks-5.cfg                               cpp/var_def_blks.cpp
+31667  cpp/var_def_blks-6.cfg                               cpp/var_def_blks.cpp
+31668  cpp/var_def_blks-7.cfg                               cpp/var_def_blks.cpp
 
 31700  cpp/toggle_processing_cmt.cfg                        cpp/toggle_processing_cmt.cpp
 31701  cpp/toggle_processing_cmt2.cfg                       cpp/toggle_processing_cmt2.cpp
@@ -588,7 +601,7 @@
 32004  common/empty.cfg                                     cpp/issue_624_angle.cpp
 32005  cpp/align_var_class_span-1.cfg                       cpp/issue_633_typename.cpp
 32006  common/space_indent_columns-4.cfg                    cpp/bug_i_687.cpp
-32007  cpp/Issue_3052.cfg                                   cpp/Issue_3052.cpp
+32007  common/Issue_3052.cfg                                cpp/Issue_3052.cpp
 32008  cpp/Issue_3034.cfg                                   cpp/Issue_3034.cpp
 32009  cpp/Issue_3422-1.cfg                                 cpp/Issue_3422.cpp
 32010  cpp/Issue_3422-2.cfg                                 cpp/Issue_3422.cpp
@@ -855,6 +868,7 @@
 # TODO: Find relevant test cases for 'override'.
 34210  common/empty.cfg                                     cpp/override_virtual.cpp
 34211  cpp/anonymous_enum.cfg                               cpp/anonymous_enum.cpp
+34212  cpp/mod_add_long_class_closebrace_comment.cfg        cpp/func_class.h
 
 34250  common/empty.cfg                                     cpp/bug_1607.cpp
 34251  cpp/bug_1649.cfg                                     cpp/bug_1649.cpp
@@ -863,6 +877,7 @@
 34254  cpp/issue_1985.cfg                                   cpp/issue_1985.cpp
 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
 
 34280  cpp/UNI-29935.cfg                                    cpp/UNI-29935.cpp
 
@@ -925,10 +940,13 @@
 
 34350  cpp/indent_comma_brace.cfg                           cpp/indent_comma_brace_glob.cpp
 34351  cpp/indent_comma_brace.cfg                           cpp/indent_comma_brace_func.cpp
+30353  common/indent_ternary_operator-1.cfg                 cpp/indent_ternary-1.cpp
 
 34360  cpp/nl_before_struct.cfg                             cpp/nl_before_struct_struct.cpp
 34361  cpp/nl_before_struct.cfg                             cpp/nl_before_struct_scoped_enum.cpp
 
+34370  cpp/asm_block_pp.cfg                                 cpp/asm_block_pp.cpp
+
 # test the options sp_ with the value "ignore"
 34500  cpp/sp_before_case_colon.cfg                         cpp/sp_before_case_colon.cpp
 34501  cpp/sp_endif_cmt.cfg                                 cpp/sp_endif_cmt.cpp
@@ -976,6 +994,15 @@
 34542  cpp/sp_byref_paren-r.cfg                             cpp/byref-4.cpp
 34543  cpp/sp_byref_paren-f.cfg                             cpp/byref-4.cpp
 
+34550  cpp/nl_throw_expr-i.cfg                              cpp/throws.cpp
+34551  cpp/nl_throw_expr-a.cfg                              cpp/throws.cpp
+34552  cpp/nl_throw_expr-r.cfg                              cpp/throws.cpp
+34553  cpp/nl_throw_expr-f.cfg                              cpp/throws.cpp
+34554  cpp/mod_paren_on_throw-i.cfg                         cpp/throws.cpp
+34555  cpp/mod_paren_on_throw-a.cfg                         cpp/throws.cpp
+34556  cpp/mod_paren_on_throw-r.cfg                         cpp/throws.cpp
+34557  cpp/mod_paren_on_throw-f.cfg                         cpp/throws.cpp
+
 # Adopt some UT tests
 10000  common/empty.cfg                                     cpp/621_this-spacing.cpp
 10001  common/empty.cfg                                     cpp/622_ifdef-indentation.cpp
@@ -1100,3 +1127,8 @@
 60084  cpp/Issue_3576-a.cfg                                 cpp/Issue_3576.h
 60085  cpp/Issue_3576-b.cfg                                 cpp/Issue_3576.h
 60086  cpp/indent_namespace_inner_only.cfg                  cpp/indent_namespace_inner_only.h
+60087  cpp/Issue_3550.cfg                                   cpp/Issue_3550.cpp
+60088  common/empty.cfg                                     cpp/Issue_3761.cpp
+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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/d.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/d.test
index 520a8c3a..520a8c3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/d.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/d.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/difftest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/difftest.sh
index 053cae17..053cae17 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/difftest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/difftest.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/ecma.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/ecma.test
index 632f3015..632f3015 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/ecma.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/examine_p_files.sh
new file mode 100644
index 00000000..327f755b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/examine_p_files.sh
@@ -0,0 +1,15 @@
+# 28. 5.2022
+#
+# Guy Maurel
+#
+#sh generate_p_files.sh
+#
+P_FILES="../build/P-files"
+#
+cd ${P_FILES}
+grep "BRACED_INIT_LIST" * | grep -v CT_BRACED_INIT_LIST | grep -v _INCLUDED > BRACED_INIT_LIST_found_list.txt
+# split with : to get the filenames only
+gawk -f ../../tests/BRACED_INIT_LIST_found_list.awk < BRACED_INIT_LIST_found_list.txt > BRACED_INIT_LIST_only_FN.txt
+set -x
+sort BRACED_INIT_LIST_only_FN.txt > BRACED_INIT_LIST_sorted.txt
+uniq BRACED_INIT_LIST_sorted.txt > BRACED_INIT_LIST_uniq.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00000-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00000-comment-indent.c
index b59ab389..b59ab389 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00000-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00000-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00001-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00001-comment-indent.c
index e4ba53de..e4ba53de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00001-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00001-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00002-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00002-comment-indent.c
index 09ca01ac..09ca01ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00002-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00002-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00003-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00003-comment-indent.c
index 0f906f2f..0f906f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00003-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00003-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00004-switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00004-switch.c
index ffb54327..ffb54327 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00004-switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00004-switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00005-cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00005-cmt-align.c
index 5e773be1..5e773be1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00005-cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00005-cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00006-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00006-comment-convert.c
index c7a019f7..c7a019f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00006-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00006-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00007-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00007-comment-convert.c
index 886d7698..886d7698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00007-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00007-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00008-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00008-comment-convert.c
index c2af0f8b..c2af0f8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00008-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00008-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00009-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00009-comment-convert.c
index 0d3f218a..0d3f218a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00009-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00009-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00010-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00010-braces.c
index c4dc5faf..c4dc5faf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00010-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00010-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00011-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00011-braces.c
index 893a32f6..893a32f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00011-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00011-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00012-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00012-braces.c
index 851f4df9..851f4df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00012-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00012-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00013-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00013-braces.c
index 2adcab76..2adcab76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00013-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00013-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00014-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00014-braces.c
index 1966a0c7..1966a0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00014-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00014-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00015-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00015-braces.c
index c29cdecd..c29cdecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00015-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00015-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00016-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00016-braces.c
index ce7df756..ce7df756 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00016-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00016-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00020-define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00020-define-if-indent.c
index f7efd78c..f7efd78c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00020-define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00020-define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00050-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00050-brace-remove.c
index 857e4031..857e4031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00050-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00050-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00051-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00051-brace-remove.c
index bef3e64d..bef3e64d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00051-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00051-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00052-brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00052-brace-remove2.c
index 30f352c6..30f352c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00052-brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00052-brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00053-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00053-brace.c
index 55c45a57..55c45a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00053-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00053-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00054-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00054-if_chain.c
index a6e0c561..a6e0c561 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00054-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00054-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00055-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00055-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00055-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00055-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00056-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00056-brace-remove3.c
index 258ca555..258ca555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00056-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00056-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00057-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00057-brace-remove3.c
index 26b22e2c..26b22e2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00057-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00057-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00058-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00058-if_chain.c
index ba15dc8e..ba15dc8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00058-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00058-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00060-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00060-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00060-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00060-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00061-braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00061-braces-3.c
index 18784b82..18784b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00061-braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00061-braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00062-braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00062-braces-4.c
index 05c0d9b5..05c0d9b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00062-braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00062-braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00065-braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00065-braces-5.c
index 6e1e6cab..6e1e6cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00065-braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00065-braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00066-vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00066-vb-while.c
index c189b7b7..c189b7b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00066-vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00066-vb-while.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00067-vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00067-vb-do.c
index 79c6dedf..79c6dedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00067-vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00067-vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00068-bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00068-bsnl.c
index 310e0eb2..310e0eb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00068-bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00068-bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00069-vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00069-vb-pp.c
index 9fb79a06..9fb79a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00069-vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00069-vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00070-return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00070-return-multi.c
index d351cdb0..d351cdb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00070-return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00070-return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00071-include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00071-include_define.h
index 89f11e5a..89f11e5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00071-include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00071-include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00072-align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00072-align-proto.c
index 15746cd9..15746cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00072-align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00072-align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00073-nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00073-nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00073-nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00073-nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00074-clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00074-clang-has_include.h
index 976de29d..976de29d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00074-clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00074-clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00076-1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00076-1225.c
index 5b51cf3c..5b51cf3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00076-1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00076-1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00081-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00081-else-if.c
index ff5f5b21..ff5f5b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00081-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00081-else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00082-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00082-else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00082-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00082-else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00083-Issue_3601.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00083-Issue_3601.c
index a2b92fa0..a2b92fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00083-Issue_3601.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00083-Issue_3601.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00091-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00091-cond.c
index 840d4a6c..840d4a6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00091-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00091-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00092-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00092-cond.c
index a718a48b..a718a48b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00092-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00092-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00093-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00093-cond.c
index 8d55652a..8d55652a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00093-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00094-Issue_3457.c
new file mode 100644
index 00000000..c6096135
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00094-Issue_3457.c
@@ -0,0 +1,12 @@
+#define IS_UNSIGNED(t) \
+	_Generic((t), \
+		 uint8_t: true, \
+		 uint16_t: true, \
+		 uint32_t: true, \
+		 uint64_t: true, \
+		 unsigned long long: true, \
+		 int8_t: false, \
+		 int16_t: false, \
+		 int32_t: false, \
+		 int64_t: false, \
+		 signed long long: false)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00101-bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00101-bugs-1.c
index abc2e08e..abc2e08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00101-bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00101-bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00102-bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00102-bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00102-bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00102-bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00103-bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00103-bugs-3.c
index 07d410b1..07d410b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00103-bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00103-bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00104-bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00104-bugs-4.c
index 61885443..61885443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00104-bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00104-bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00105-bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00105-bugs-5.c
index 72bfbe4d..72bfbe4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00105-bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00105-bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00106-bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00106-bugs-6.c
index 302c2328..302c2328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00106-bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00106-bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00107-bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00107-bugs-7.c
index 34fc146e..34fc146e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00107-bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00107-bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00108-bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00108-bugs-8.c
index 0eae4dff..0eae4dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00108-bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00108-bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00110-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00110-misc.c
index fdca271b..fdca271b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00110-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00110-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00111-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00111-misc.c
index ad40a4ea..ad40a4ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00111-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00111-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00120-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00120-sp_cmt_cpp_start.c
index 74a333c5..74a333c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00120-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00120-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00121-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00121-sp_cmt_cpp_start.c
index 3160a288..3160a288 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00121-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00121-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00122-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00122-sp_cmt_cpp_start.c
index fe237c5a..fe237c5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00122-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00122-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00123-cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00123-cmt_reflow.c
index 44e0cf34..44e0cf34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00123-cmt_reflow.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00123-cmt_reflow.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00130-minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00130-minus-minus.c
index debe70a8..debe70a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00130-minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00131-Issue_3873.c
new file mode 100644
index 00000000..a0dc10df
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00131-Issue_3873.c
@@ -0,0 +1,3 @@
+while (true)
+{	/* hello */
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00135-br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00135-br_cmt.c
index 9e6c6de9..9e6c6de9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00135-br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00135-br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00140-global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00140-global-vars.c
index 0df79336..0df79336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00140-global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00140-global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00141-deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00141-deref.c
index a7ad3f5e..a7ad3f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00141-deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00141-deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00142-type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00142-type-cast.c
index 93076825..93076825 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00142-type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00142-type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00143-t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00143-t3.in.c
index b40fbd17..b40fbd17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00143-t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00143-t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00144-align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00144-align-proto-vars.c
index c7bf6081..c7bf6081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00144-align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00144-align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00145-vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00145-vardefcol.c
index 1238be0d..1238be0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00145-vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00145-vardefcol.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00146-Issue_3516.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00146-Issue_3516.c
index 828d2611..828d2611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00146-Issue_3516.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00146-Issue_3516.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00147-Issue_3516.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00147-Issue_3516.c
index 63b9a440..63b9a440 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00147-Issue_3516.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00147-Issue_3516.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00148-Issue_3518.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00148-Issue_3518.c
index cf8d0c95..cf8d0c95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00148-Issue_3518.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00148-Issue_3518.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00150-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00150-casts.c
index d89ad598..d89ad598 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00150-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00150-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00151-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00151-casts.c
index 9f2a13de..9f2a13de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00151-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00151-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00152-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00152-casts.c
index acc2ebe4..acc2ebe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00152-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00152-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00153-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00153-casts.c
index 8bf710b6..8bf710b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00153-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00153-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00154-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00154-casts.c
index fca4010b..fca4010b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00154-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00154-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00155-cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00155-cast_brace.c
index 6e8f12b2..6e8f12b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00155-cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00156-empty-braces.c
new file mode 100644
index 00000000..d7905dfa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00156-empty-braces.c
@@ -0,0 +1,51 @@
+void single_line(int* a, int *b, int * c) {}
+
+void braces_on_newline(int* a, int *b, int * c)
+{}
+
+void braces_on_separate_lines(int* a, int *b, int * c)
+{}
+
+void braces_on_multiple_empty_lines(int* a, int *b, int * c)
+{}
+
+int main()
+{
+	for (int i=0; i<10; i++) {}
+
+	for (int i=0; i<10; i++) {
+	}
+
+	for (int i=0; i<10; i++) {
+
+	}
+
+	while (true) {}
+
+	while (true) {
+	}
+
+	while (true) {
+
+	}
+
+
+	do{} while (true);
+
+	do{
+	} while (true);
+
+	do{
+
+	} while (true);
+
+
+	if(true) {}
+
+	if(true) {
+	}
+
+	if(true) {
+
+	}
+}
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.76.0/tests/expected/c/00157-empty-braces.c
new file mode 100644
index 00000000..328af18d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00157-empty-braces.c
@@ -0,0 +1,45 @@
+void single_line(int* a, int *b, int * c) {
+}
+
+void braces_on_newline(int* a, int *b, int * c)
+{
+}
+
+void braces_on_separate_lines(int* a, int *b, int * c)
+{
+}
+
+void braces_on_multiple_empty_lines(int* a, int *b, int * c)
+{
+
+
+}
+
+int main()
+{
+	for (int i=0; i<10; i++) {}
+
+	for (int i=0; i<10; i++) {}
+
+	for (int i=0; i<10; i++) {}
+
+	while (true) {}
+
+	while (true) {}
+
+	while (true) {}
+
+
+	do{} while (true);
+
+	do{} while (true);
+
+	do{} while (true);
+
+
+	if(true) {}
+
+	if(true) {}
+
+	if(true) {}
+}
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.76.0/tests/expected/c/00158-empty-braces.c
new file mode 100644
index 00000000..8182538f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00158-empty-braces.c
@@ -0,0 +1,57 @@
+void single_line(int* a, int *b, int * c) {
+}
+
+void braces_on_newline(int* a, int *b, int * c)
+{
+}
+
+void braces_on_separate_lines(int* a, int *b, int * c)
+{
+}
+
+void braces_on_multiple_empty_lines(int* a, int *b, int * c)
+{
+
+
+}
+
+int main()
+{
+	for (int i=0; i<10; i++) {}
+
+	for (int i=0; i<10; i++) {
+	}
+
+	for (int i=0; i<10; i++) {
+
+	}
+
+	while (true) {}
+
+	while (true) {
+	}
+
+	while (true) {
+
+	}
+
+
+	do{} while (true);
+
+	do{
+	} while (true);
+
+	do{
+
+	} while (true);
+
+
+	if(true) {}
+
+	if(true) {
+	}
+
+	if(true) {
+
+	}
+}
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.76.0/tests/expected/c/00159-empty-braces.c
new file mode 100644
index 00000000..d49e27d5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00159-empty-braces.c
@@ -0,0 +1,39 @@
+void single_line(int* a, int *b, int * c) {}
+
+void braces_on_newline(int* a, int *b, int * c)
+{}
+
+void braces_on_separate_lines(int* a, int *b, int * c)
+{}
+
+void braces_on_multiple_empty_lines(int* a, int *b, int * c)
+{}
+
+int main()
+{
+	for (int i=0; i<10; i++) {}
+
+	for (int i=0; i<10; i++) {}
+
+	for (int i=0; i<10; i++) {}
+
+	while (true) {}
+
+	while (true) {}
+
+	while (true) {}
+
+
+	do{} while (true);
+
+	do{} while (true);
+
+	do{} while (true);
+
+
+	if(true) {}
+
+	if(true) {}
+
+	if(true) {}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00160-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00160-fcn_indent.c
index 23c173c2..23c173c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00160-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00160-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00161-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00161-fcn_indent.c
index 90342554..90342554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00161-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00161-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00162-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00162-fcn_indent.c
index c8f152d3..c8f152d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00162-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00162-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00163-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00163-fcn_indent.c
index bbf36763..bbf36763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00163-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00163-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00164-fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
index c029669a..c029669a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
index af30d708..af30d708 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00170-beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00170-beautifier-off.c
index 351d76ff..351d76ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00170-beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00170-beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00180-lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00180-lvalue.c
index a8121da4..a8121da4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00180-lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00190-Issue_3559.c
new file mode 100644
index 00000000..a89c9d50
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00190-Issue_3559.c
@@ -0,0 +1,2 @@
+#define my_thing(stuff) \
+	&object3, &object4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00201-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00201-case.c
index 0d004c19..0d004c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00201-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00201-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00202-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00202-case.c
index d5175084..d5175084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00202-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00202-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00203-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00203-case.c
index 548a2a64..548a2a64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00203-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00203-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00204-bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00204-bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00204-bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00204-bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00205-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00205-case-nl_before_return.c
index b650d7ab..b650d7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00205-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00205-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00206-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00206-case-nl_before_return.c
index d0b6bbbb..d0b6bbbb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00206-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00206-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00207-nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00207-nl_before_ignore_after_case.c
index 4c361605..4c361605 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00207-nl_before_ignore_after_case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00207-nl_before_ignore_after_case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00301-align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00301-align-struct-init.c
index cfa44035..cfa44035 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00301-align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00301-align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00302-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00302-one-liner-init.c
index 63c86afe..63c86afe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00302-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00302-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00303-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00303-one-liner-init.c
index 503eedfb..503eedfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00303-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00303-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00304-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00304-one-liner-init.c
index 471aaa2d..471aaa2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00304-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00304-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00305-one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00305-one-liner-define.c
index 99f24f5a..99f24f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00305-one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00305-one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00310-sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00310-sp_embed_comment.c
index 3dc105aa..3dc105aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00310-sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00310-sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00320-indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00320-indent_first_bool_expr.c
index 0dcaa413..0dcaa413 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00320-indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00320-indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00401-align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00401-align-equ.c
index 9b213f96..9b213f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00401-align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00401-align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00402-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00402-align-var.c
index d7396d46..d7396d46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00402-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00402-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00403-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00403-align-var.c
index cb62295e..cb62295e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00403-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00403-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00404-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00404-align-var.c
index 48af3d3c..48af3d3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00404-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00404-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00405-bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00405-bits.c
index 9a5a6ceb..9a5a6ceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00405-bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00405-bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00406-bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00406-bug_i_771.c
index 9c2b1cc2..9c2b1cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00406-bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00407-star-style.c
new file mode 100644
index 00000000..156d2a27
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00407-star-style.c
@@ -0,0 +1,81 @@
+//          gap ↘ |123456| ↙ gap
+static int *             a;
+static unsigned int **   b;
+static short int *       c;
+static long int          d;
+static int ***           e;
+//          gap ↗ |123456| ↖ gap
+
+//                                gap ↘ |12345678| ↙ gap
+int function_with_no_star_parameters (int        parameter)
+//                                gap ↗ |12345678| ↖ gap
+{
+	return 0;
+}
+
+//                           gap ↘ |12345678| ↙ gap
+int function_with_stars(int *               f,
+                        unsigned int **     g,
+                        short int *         h,
+                        long int            i,
+                        int ***             j)
+//                           gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int *             k;
+	unsigned int **   l;
+	short int *       m;
+	long int          n;
+	int ***           o;
+//           gap ↗ |123456| ↖ gap
+	return 0;
+}
+
+//                                            gap ↘ |12345678| ↙ gap
+int function_closer_than_16_lines_from_j(int *               p,
+                                         unsigned int **     q,
+                                         short int *         r,
+                                         long int            s,
+                                         int ***             t)
+//                                            gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int *             u;
+	unsigned int **   v;
+	short int *       w;
+	long int          x;
+	int ***           y;
+//           gap ↗ |123456| ↖ gap
+
+	/* The point of this comment is merely to make the
+	 * function longer than 16 lines.
+	 *
+	 * We're doing this to show that parameter alignment is
+	 * per parameter list, and that parameter lists from
+	 * multiple functions aren't lined up with each other.
+	 *
+	 * You can see that by noticing that function_with_stars and this
+	 * function don't have parameter lists aligned with each
+	 * other, and this function and the function below it are
+	 * too far away anyway.
+	 */
+	return 0;
+}
+
+//                                 gap ↘ |12345678| ↙ gap
+int more_than_16_lines_from_t(int *               z,
+                              unsigned int **     zz,
+                              short int *         zzz,
+                              long int            zzzz,
+                              int ***             zzzzz)
+//                                 gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int *             zzzzzz;
+	unsigned int **   zzzzzzz;
+	short int *       zzzzzzzz;
+	long int          zzzzzzzzz;
+	int ***           zzzzzzzzzz;
+//           gap ↗ |123456| ↖ gap
+	return 0;
+}
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.76.0/tests/expected/c/00408-star-style.c
new file mode 100644
index 00000000..e2e834e2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00408-star-style.c
@@ -0,0 +1,81 @@
+//          gap ↘ |123456| ↙ gap
+static int               *a;
+static unsigned int      **b;
+static short int         *c;
+static long int          d;
+static int               ***e;
+//          gap ↗ |123456| ↖ gap
+
+//                                gap ↘ |12345678| ↙ gap
+int function_with_no_star_parameters (int        parameter)
+//                                gap ↗ |12345678| ↖ gap
+{
+	return 0;
+}
+
+//                           gap ↘ |12345678| ↙ gap
+int function_with_stars(int                 *f,
+                        unsigned int        **g,
+                        short int           *h,
+                        long int            i,
+                        int                 ***j)
+//                           gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int               *k;
+	unsigned int      **l;
+	short int         *m;
+	long int          n;
+	int               ***o;
+//           gap ↗ |123456| ↖ gap
+	return 0;
+}
+
+//                                            gap ↘ |12345678| ↙ gap
+int function_closer_than_16_lines_from_j(int                 *p,
+                                         unsigned int        **q,
+                                         short int           *r,
+                                         long int            s,
+                                         int                 ***t)
+//                                            gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int               *u;
+	unsigned int      **v;
+	short int         *w;
+	long int          x;
+	int               ***y;
+//           gap ↗ |123456| ↖ gap
+
+	/* The point of this comment is merely to make the
+	 * function longer than 16 lines.
+	 *
+	 * We're doing this to show that parameter alignment is
+	 * per parameter list, and that parameter lists from
+	 * multiple functions aren't lined up with each other.
+	 *
+	 * You can see that by noticing that function_with_stars and this
+	 * function don't have parameter lists aligned with each
+	 * other, and this function and the function below it are
+	 * too far away anyway.
+	 */
+	return 0;
+}
+
+//                                 gap ↘ |12345678| ↙ gap
+int more_than_16_lines_from_t(int                 *z,
+                              unsigned int        **zz,
+                              short int           *zzz,
+                              long int            zzzz,
+                              int                 ***zzzzz)
+//                                 gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int               *zzzzzz;
+	unsigned int      **zzzzzzz;
+	short int         *zzzzzzzz;
+	long int          zzzzzzzzz;
+	int               ***zzzzzzzzzz;
+//           gap ↗ |123456| ↖ gap
+	return 0;
+}
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.76.0/tests/expected/c/00409-star-style.c
new file mode 100644
index 00000000..fd5e3255
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00409-star-style.c
@@ -0,0 +1,81 @@
+//          gap ↘ |123456| ↙ gap
+static int              *a;
+static unsigned int    **b;
+static short int        *c;
+static long int          d;
+static int            ***e;
+//          gap ↗ |123456| ↖ gap
+
+//                                gap ↘ |12345678| ↙ gap
+int function_with_no_star_parameters (int        parameter)
+//                                gap ↗ |12345678| ↖ gap
+{
+	return 0;
+}
+
+//                           gap ↘ |12345678| ↙ gap
+int function_with_stars(int                *f,
+                        unsigned int      **g,
+                        short int          *h,
+                        long int            i,
+                        int              ***j)
+//                           gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int              *k;
+	unsigned int    **l;
+	short int        *m;
+	long int          n;
+	int            ***o;
+//           gap ↗ |123456| ↖ gap
+	return 0;
+}
+
+//                                            gap ↘ |12345678| ↙ gap
+int function_closer_than_16_lines_from_j(int                *p,
+                                         unsigned int      **q,
+                                         short int          *r,
+                                         long int            s,
+                                         int              ***t)
+//                                            gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int              *u;
+	unsigned int    **v;
+	short int        *w;
+	long int          x;
+	int            ***y;
+//           gap ↗ |123456| ↖ gap
+
+	/* The point of this comment is merely to make the
+	 * function longer than 16 lines.
+	 *
+	 * We're doing this to show that parameter alignment is
+	 * per parameter list, and that parameter lists from
+	 * multiple functions aren't lined up with each other.
+	 *
+	 * You can see that by noticing that function_with_stars and this
+	 * function don't have parameter lists aligned with each
+	 * other, and this function and the function below it are
+	 * too far away anyway.
+	 */
+	return 0;
+}
+
+//                                 gap ↘ |12345678| ↙ gap
+int more_than_16_lines_from_t(int                *z,
+                              unsigned int      **zz,
+                              short int          *zzz,
+                              long int            zzzz,
+                              int              ***zzzzz)
+//                                 gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+	int              *zzzzzz;
+	unsigned int    **zzzzzzz;
+	short int        *zzzzzzzz;
+	long int          zzzzzzzzz;
+	int            ***zzzzzzzzzz;
+//           gap ↗ |123456| ↖ gap
+	return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00411-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00411-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00411-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00411-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00412-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00412-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00412-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00412-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00413-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00413-align-typedef.c
index d5f826e5..d5f826e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00413-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00413-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00414-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00414-align-typedef.c
index 8e63e499..8e63e499 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00414-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00414-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00415-align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00415-align_stack.c
index 507d6da2..507d6da2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00415-align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00415-align_stack.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00416-align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00416-align_sf_call_thresh_416.c
index 36fbca84..36fbca84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00416-align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00416-align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00417-align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00417-align_sf_call_thresh_417.c
index 3047b932..3047b932 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00417-align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00417-align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00418-align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00418-align_sf_call_span_418.c
index 82444a2b..82444a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00418-align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00418-align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00419-align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00419-align_sf_call_span_419.c
index 20b9705a..20b9705a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00419-align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00419-align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00420-Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00420-Issue-2278.c
index 2bab88ab..2bab88ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00420-Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00420-Issue-2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00421-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00421-nl_ds_struct_enum.c
index ec5bcc31..ec5bcc31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00421-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00421-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00422-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00422-nl_ds_struct_enum.c
index d45b2add..d45b2add 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00422-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00422-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00423-bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00423-bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00423-bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00424-Issue_3506.c
new file mode 100644
index 00000000..c3cdd0f8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00424-Issue_3506.c
@@ -0,0 +1,12 @@
+#define CONCAT2x(a,b) a ## _ ## b
+#define CONCAT2(a,b) CONCAT2x(a,b)
+
+typedef struct S {
+	int a;
+	int b;
+} S;
+
+static const S CONCAT2(foo, bar) = {
+	3,
+	4
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00430-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00430-paren-indent.c
index f6b148ce..f6b148ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00430-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00430-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00431-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00431-paren-indent.c
index 51a80854..51a80854 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00431-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00431-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00432-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00432-paren-indent.c
index 9ab77831..9ab77831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00432-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00432-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00440-bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00440-bug_489.c
index 47a5da06..47a5da06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00440-bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00440-bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00451-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00451-enum_gallery.c
index 3cb8db3c..3cb8db3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00451-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00451-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00452-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00452-enum_gallery.c
index cb235c3d..cb235c3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00452-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00452-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.c
index af537d1d..af537d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.rerun.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.rerun.c
index 148f1970..148f1970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.rerun.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.rerun.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00454-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00454-enum_gallery.c
index 8d00cbce..8d00cbce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00454-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00454-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00461-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00461-align_func_proto_star_amp.h
index 5b0490c8..5b0490c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00461-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00461-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00462-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00462-align_func_proto_star_amp.h
index c05fc454..c05fc454 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00462-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00462-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00463-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00463-align_func_proto_star_amp.h
index 702b9396..702b9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00463-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00463-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00464-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00464-align_func_proto_star_amp.h
index f1f927dc..f1f927dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00464-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00464-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00465-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00465-align_func_proto_star_amp.h
index 9bd55a23..9bd55a23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00465-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00465-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00466-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00466-align_func_proto_star_amp.h
index b91044f7..b91044f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00466-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00466-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00467-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00467-align_func_proto_star_amp.h
index e87c4cd8..e87c4cd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00467-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00467-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00468-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00468-align_func_proto_star_amp.h
index 0fb8eacb..0fb8eacb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00468-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00468-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00469-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00469-align_func_proto_star_amp.h
index 5f776985..5f776985 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00469-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00470-align_trailing_do_cmt.c
new file mode 100644
index 00000000..7c21b3d9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00470-align_trailing_do_cmt.c
@@ -0,0 +1,10 @@
+int foo(void) {
+	int r;
+	do { // this comment should be aligned with the one below
+		r = bar();
+	} while (r);
+
+	do { // this comment should be aligned with the one above
+		r = baz();
+	} while (r);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00501-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00501-bool-pos.c
index b9d537a1..b9d537a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00501-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00501-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00502-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00502-bool-pos.c
index 7890fcd7..7890fcd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00502-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00502-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00503-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00503-pos_compare.c
index cc809a09..cc809a09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00503-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00503-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00504-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00504-pos_compare.c
index fe16e10e..fe16e10e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00504-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00504-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00505-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00505-pos_conditional.c
index 91f17d57..91f17d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00505-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00505-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00506-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00506-pos_conditional.c
index 23945656..23945656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00506-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00506-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00510-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00510-bool-pos.c
index 5958e3c5..5958e3c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00510-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00510-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00511-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00511-bool-pos.c
index 8f6effd8..8f6effd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00511-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00511-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00512-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00512-bool-pos.c
index 2e82b7ef..2e82b7ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00512-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00512-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00513-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00513-bool-pos.c
index cad844c5..cad844c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00513-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00513-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00514-my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00514-my_infile.c
index 3f4c76fb..3f4c76fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00514-my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00514-my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00600-dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00600-dos.c
index a0482ba3..a0482ba3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00600-dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00600-dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00601-mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00601-mac.c
index 2be04c61..2be04c61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00601-mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00601-mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00611-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00611-pp-space.c
index 217fc89a..217fc89a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00611-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00611-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00612-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00612-pp-space.c
index 7c19bf1e..7c19bf1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00612-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00612-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00613-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00613-pp-space.c
index 7092a193..7092a193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00613-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00613-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00614-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00614-pp-space.c
index 103c2ca4..103c2ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00614-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00614-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00615-pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00615-pp-nest.c
index 5e99a1d0..5e99a1d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00615-pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00615-pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00616-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00616-pp-if-indent.c
index dc2dea10..dc2dea10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00616-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00616-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00617-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00617-pp-if-indent.c
index 2caf73d2..2caf73d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00617-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00617-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00618-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00618-pp-if-indent.c
index f7b3d270..f7b3d270 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00618-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00618-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00619-Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00619-Issue_3169.c
index 848e451e..848e451e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00619-Issue_3169.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00619-Issue_3169.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00620-indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00620-indent-assign.c
index c01e146a..c01e146a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00620-indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00620-indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00621-nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00621-nl_endif.c
index bae6272c..bae6272c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00621-nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00621-nl_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00622-indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00622-indent-off-after-assign.c
index eb083f7b..eb083f7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00622-indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00623-pp_space_before_after.c
new file mode 100644
index 00000000..4b390a51
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00623-pp_space_before_after.c
@@ -0,0 +1,116 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+#ifndef __EMX__
+#define XTRANSDEBUG 1
+#else
+#define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+#define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+#include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+#ifndef MINIX
+#ifndef Lynx
+#include <sys/socket.h>
+#else
+#include <socket.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+#ifdef __EMX__
+#include <sys/ioctl.h>
+#endif
+
+#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+#ifndef NEED_UTSNAME
+#define NEED_UTSNAME
+#endif
+#include <sys/utsname.h>
+#endif
+
+#ifndef TRANS_OPEN_MAX
+
+#ifndef X_NOT_POSIX
+#ifdef _POSIX_SOURCE
+#include <limits.h>
+#else
+#define _POSIX_SOURCE
+#include <limits.h>
+#undef _POSIX_SOURCE
+#endif
+#endif
+#ifndef OPEN_MAX
+#ifdef __GNU__
+#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+#endif
+#ifdef SVR4
+#define OPEN_MAX 256
+#else
+#include <sys/param.h>
+#ifndef OPEN_MAX
+#if defined(__OSF1__) || defined(__osf__)
+#define OPEN_MAX 256
+#else
+#ifdef NOFILE
+#define OPEN_MAX NOFILE
+#else
+#if !defined(__EMX__) && !defined(__QNX__)
+#define OPEN_MAX NOFILES_MAX
+#else
+#define OPEN_MAX 256
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#ifdef __GNU__
+#define TRANS_OPEN_MAX OPEN_MAX
+#elif OPEN_MAX > 256
+#define TRANS_OPEN_MAX 256
+#else
+#define TRANS_OPEN_MAX OPEN_MAX
+#endif /*__GNU__*/
+
+#endif /* TRANS_OPEN_MAX */
+
+#ifdef __EMX__
+#define ESET(val)
+#else
+#define ESET(val) errno = val
+#endif
+#define EGET() errno
+
+#else /* _WIN32 */
+
+#include <limits.h>     /* for USHRT_MAX */
+
+#define ESET(val) WSASetLastError(val)
+#define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifdef X11_t
+#define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/00624-pp_space_before_after.c
new file mode 100644
index 00000000..06aee282
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00624-pp_space_before_after.c
@@ -0,0 +1,116 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+#ifndef __EMX__
+# define XTRANSDEBUG 1
+#else
+# define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+# define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+# include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+# ifndef MINIX
+#  ifndef Lynx
+#   include <sys/socket.h>
+#  else
+#   include <socket.h>
+#  endif
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+# endif
+# ifdef __EMX__
+#  include <sys/ioctl.h>
+# endif
+
+# if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+#  ifndef NEED_UTSNAME
+#   define NEED_UTSNAME
+#  endif
+#  include <sys/utsname.h>
+# endif
+
+# ifndef TRANS_OPEN_MAX
+
+#  ifndef X_NOT_POSIX
+#   ifdef _POSIX_SOURCE
+#    include <limits.h>
+#   else
+#    define _POSIX_SOURCE
+#    include <limits.h>
+#    undef _POSIX_SOURCE
+#   endif
+#  endif
+#  ifndef OPEN_MAX
+#   ifdef __GNU__
+#    define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+#   endif
+#   ifdef SVR4
+#    define OPEN_MAX 256
+#   else
+#    include <sys/param.h>
+#    ifndef OPEN_MAX
+#     if defined(__OSF1__) || defined(__osf__)
+#      define OPEN_MAX 256
+#     else
+#      ifdef NOFILE
+#       define OPEN_MAX NOFILE
+#      else
+#       if !defined(__EMX__) && !defined(__QNX__)
+#        define OPEN_MAX NOFILES_MAX
+#       else
+#        define OPEN_MAX 256
+#       endif
+#      endif
+#     endif
+#    endif
+#   endif
+#  endif
+#  ifdef __GNU__
+#   define TRANS_OPEN_MAX OPEN_MAX
+#  elif OPEN_MAX > 256
+#   define TRANS_OPEN_MAX 256
+#  else
+#   define TRANS_OPEN_MAX OPEN_MAX
+#  endif /*__GNU__*/
+
+# endif /* TRANS_OPEN_MAX */
+
+# ifdef __EMX__
+#  define ESET(val)
+# else
+#  define ESET(val) errno = val
+# endif
+# define EGET() errno
+
+#else /* _WIN32 */
+
+# include <limits.h>    /* for USHRT_MAX */
+
+# define ESET(val) WSASetLastError(val)
+# define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+# define NULL 0
+#endif
+
+#ifdef X11_t
+# define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/00625-pp_space_before_after.c
new file mode 100644
index 00000000..0b37952e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00625-pp_space_before_after.c
@@ -0,0 +1,116 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+#ifndef __EMX__
+ #define XTRANSDEBUG 1
+#else
+ #define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ #define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ #include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ #ifndef MINIX
+  #ifndef Lynx
+   #include <sys/socket.h>
+  #else
+   #include <socket.h>
+  #endif
+  #include <netinet/in.h>
+  #include <arpa/inet.h>
+ #endif
+ #ifdef __EMX__
+  #include <sys/ioctl.h>
+ #endif
+
+ #if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+  #ifndef NEED_UTSNAME
+   #define NEED_UTSNAME
+  #endif
+  #include <sys/utsname.h>
+ #endif
+
+ #ifndef TRANS_OPEN_MAX
+
+  #ifndef X_NOT_POSIX
+   #ifdef _POSIX_SOURCE
+    #include <limits.h>
+   #else
+    #define _POSIX_SOURCE
+    #include <limits.h>
+    #undef _POSIX_SOURCE
+   #endif
+  #endif
+  #ifndef OPEN_MAX
+   #ifdef __GNU__
+    #define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+   #endif
+   #ifdef SVR4
+    #define OPEN_MAX 256
+   #else
+    #include <sys/param.h>
+    #ifndef OPEN_MAX
+     #if defined(__OSF1__) || defined(__osf__)
+      #define OPEN_MAX 256
+     #else
+      #ifdef NOFILE
+       #define OPEN_MAX NOFILE
+      #else
+       #if !defined(__EMX__) && !defined(__QNX__)
+	#define OPEN_MAX NOFILES_MAX
+       #else
+	#define OPEN_MAX 256
+       #endif
+      #endif
+     #endif
+    #endif
+   #endif
+  #endif
+  #ifdef __GNU__
+   #define TRANS_OPEN_MAX OPEN_MAX
+  #elif OPEN_MAX > 256
+   #define TRANS_OPEN_MAX 256
+  #else
+   #define TRANS_OPEN_MAX OPEN_MAX
+  #endif /*__GNU__*/
+
+ #endif /* TRANS_OPEN_MAX */
+
+ #ifdef __EMX__
+  #define ESET(val)
+ #else
+  #define ESET(val) errno = val
+ #endif
+ #define EGET() errno
+
+#else /* _WIN32 */
+
+ #include <limits.h>    /* for USHRT_MAX */
+
+ #define ESET(val) WSASetLastError(val)
+ #define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ #define NULL 0
+#endif
+
+#ifdef X11_t
+ #define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/00626-pp_space_before_after.c
new file mode 100644
index 00000000..ce21809e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00626-pp_space_before_after.c
@@ -0,0 +1,116 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+#ifndef __EMX__
+ # define XTRANSDEBUG 1
+#else
+ # define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ # define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ # include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ # ifndef MINIX
+  #  ifndef Lynx
+   #   include <sys/socket.h>
+  #  else
+   #   include <socket.h>
+  #  endif
+  #  include <netinet/in.h>
+  #  include <arpa/inet.h>
+ # endif
+ # ifdef __EMX__
+  #  include <sys/ioctl.h>
+ # endif
+
+ # if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+  #  ifndef NEED_UTSNAME
+   #   define NEED_UTSNAME
+  #  endif
+  #  include <sys/utsname.h>
+ # endif
+
+ # ifndef TRANS_OPEN_MAX
+
+  #  ifndef X_NOT_POSIX
+   #   ifdef _POSIX_SOURCE
+    #    include <limits.h>
+   #   else
+    #    define _POSIX_SOURCE
+    #    include <limits.h>
+    #    undef _POSIX_SOURCE
+   #   endif
+  #  endif
+  #  ifndef OPEN_MAX
+   #   ifdef __GNU__
+    #    define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+   #   endif
+   #   ifdef SVR4
+    #    define OPEN_MAX 256
+   #   else
+    #    include <sys/param.h>
+    #    ifndef OPEN_MAX
+     #     if defined(__OSF1__) || defined(__osf__)
+      #      define OPEN_MAX 256
+     #     else
+      #      ifdef NOFILE
+       #       define OPEN_MAX NOFILE
+      #      else
+       #       if !defined(__EMX__) && !defined(__QNX__)
+	#        define OPEN_MAX NOFILES_MAX
+       #       else
+	#        define OPEN_MAX 256
+       #       endif
+      #      endif
+     #     endif
+    #    endif
+   #   endif
+  #  endif
+  #  ifdef __GNU__
+   #   define TRANS_OPEN_MAX OPEN_MAX
+  #  elif OPEN_MAX > 256
+   #   define TRANS_OPEN_MAX 256
+  #  else
+   #   define TRANS_OPEN_MAX OPEN_MAX
+  #  endif /*__GNU__*/
+
+ # endif /* TRANS_OPEN_MAX */
+
+ # ifdef __EMX__
+  #  define ESET(val)
+ # else
+  #  define ESET(val) errno = val
+ # endif
+ # define EGET() errno
+
+#else /* _WIN32 */
+
+ # include <limits.h>   /* for USHRT_MAX */
+
+ # define ESET(val) WSASetLastError(val)
+ # define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ # define NULL 0
+#endif
+
+#ifdef X11_t
+ # define X_TCP_PORT      6000
+#endif
+
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00631-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00631-nl_assign.c
index 7319d498..7319d498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00631-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00631-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00632-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00632-nl_assign.c
index 2452e773..2452e773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00632-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00632-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00633-bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00633-bug_3156.c
index 508a0098..508a0098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00633-bug_3156.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00633-bug_3156.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00701-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00701-function-def.c
index 6f0133e8..6f0133e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00701-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00701-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00702-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00702-function-def.c
index eaa568da..eaa568da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00702-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00702-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00703-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00703-function-def.c
index 76cf664f..76cf664f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00703-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00703-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00710-add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00710-add_long_comment.c
index 82bf680e..82bf680e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00710-add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00710-add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00721-nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00721-nl-semicolon.c
index 441091b5..441091b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00721-nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/00730-nl_func_call.c
new file mode 100644
index 00000000..38c17e45
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00730-nl_func_call.c
@@ -0,0 +1,139 @@
+void example(int a, int b, int c, int d);
+void example2(void);
+void userfunc
+(
+	int w,
+	int x,
+	int y,
+	int z
+);
+
+int main(void) {
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example2
+	(
+	);
+
+	example2
+	(
+	);
+
+	example2
+	(
+	);
+
+	example2
+	(
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+}
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.76.0/tests/expected/c/00731-nl_func_call.c
new file mode 100644
index 00000000..38c17e45
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00731-nl_func_call.c
@@ -0,0 +1,139 @@
+void example(int a, int b, int c, int d);
+void example2(void);
+void userfunc
+(
+	int w,
+	int x,
+	int y,
+	int z
+);
+
+int main(void) {
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example2
+	(
+	);
+
+	example2
+	(
+	);
+
+	example2
+	(
+	);
+
+	example2
+	(
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+}
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.76.0/tests/expected/c/00732-nl_func_call.c
new file mode 100644
index 00000000..b57470e8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00732-nl_func_call.c
@@ -0,0 +1,41 @@
+void example(int a, int b, int c, int d);
+void example2(void);
+void userfunc(int w, int x, int y, int z);
+
+int main(void) {
+	example(1, 2, 3, 4);
+
+	example(1, 2,3, 4);
+
+	example(1,2,3, 4);
+
+	example(1,2,3, 4);
+
+	example(1, 2, 3, 4);
+
+	example(   1,2,3, 4);
+
+	example(   1,2,3, 4);
+
+	example2();
+
+	example2();
+
+	example2();
+
+	example2(    );
+
+	userfunc(1, 2, 3, 4);
+
+	userfunc(1, 2,3, 4);
+
+	userfunc(1,2,3, 4);
+
+	userfunc(1,2,3, 4);
+
+	userfunc(1, 2, 3, 4);
+
+	userfunc(   1,2,3, 4);
+
+	userfunc(   1,2,3, 4);
+}
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.76.0/tests/expected/c/00733-nl_func_call.c
new file mode 100644
index 00000000..2290132d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00733-nl_func_call.c
@@ -0,0 +1,59 @@
+void example(int a, int b, int c, int d);
+void example2(void);
+void userfunc(int w, int x, int y, int z);
+
+int main(void) {
+	example(1, 2, 3, 4);
+
+	example(1, 2,
+	        3, 4);
+
+	example(1,
+	        2,
+	        3, 4);
+
+	example(1,
+	        2,
+	        3, 4);
+
+	example(1, 2, 3, 4);
+
+	example(   1,
+	           2,
+	           3, 4);
+
+	example(   1,
+	           2,
+	           3, 4);
+
+	example2();
+
+	example2();
+
+	example2();
+
+	example2(    );
+
+	userfunc(1, 2, 3, 4);
+
+	userfunc(1, 2,
+	         3, 4);
+
+	userfunc(1,
+	         2,
+	         3, 4);
+
+	userfunc(1,
+	         2,
+	         3, 4);
+
+	userfunc(1, 2, 3, 4);
+
+	userfunc(   1,
+	            2,
+	            3, 4);
+
+	userfunc(   1,
+	            2,
+	            3, 4);
+}
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.76.0/tests/expected/c/00734-nl_func_call.c
new file mode 100644
index 00000000..8233b0ec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00734-nl_func_call.c
@@ -0,0 +1,108 @@
+void example(int a, int b, int c, int d);
+void example2(void);
+void userfunc(int w,
+              int x,
+              int y,
+              int z);
+
+int main(void) {
+	example(1,
+	        2,
+	        3,
+	        4);
+
+	example(1,
+	        2,
+	        3,
+	        4);
+
+	example(
+		1,
+		2,
+		3,
+		4);
+
+	example(
+		1,
+		2,
+		3,
+		4
+		);
+
+	example
+	        (1,
+	        2,
+	        3,
+	        4);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4);
+
+	example
+	(
+		1,
+		2,
+		3,
+		4
+	);
+
+	example2();
+
+	example2(
+		);
+
+	example2
+	        ();
+
+	example2
+	(
+	);
+
+	userfunc(1,
+	         2,
+	         3,
+	         4);
+
+	userfunc(1,
+	         2,
+	         3,
+	         4);
+
+	userfunc(
+		1,
+		2,
+		3,
+		4);
+
+	userfunc(
+		1,
+		2,
+		3,
+		4
+		);
+
+	userfunc
+	        (1,
+	        2,
+	        3,
+	        4);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4);
+
+	userfunc
+	(
+		1,
+		2,
+		3,
+		4
+	);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00801-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00801-fcn_type.c
index 72af3fa3..72af3fa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00801-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00801-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00802-funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00802-funcfunc.c
index 4d0f0432..4d0f0432 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00802-funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00802-funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00803-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00803-fcn_type.c
index 9e1e5c55..9e1e5c55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00803-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00803-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00901-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00901-code_width.c
index 6c2a99c7..6c2a99c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00901-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00901-code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00902-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00902-code_width.c
index be2e42f4..be2e42f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00902-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00902-code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00903-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00903-code_width.c
index 70b3a113..70b3a113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00903-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00903-code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00910-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00910-pascal_ptr.c
index 27a9cdef..27a9cdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00910-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00910-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00911-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00911-pascal_ptr.c
index 4c0d0dde..4c0d0dde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00911-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00911-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01000-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01000-mod-paren.c
index ca919f77..ca919f77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01000-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01000-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01001-nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01001-nl-comment.c
index ecac3e2a..ecac3e2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01001-nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01001-nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01002-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01002-mod-paren.c
index 2537330f..2537330f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01002-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01002-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01005-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01005-mod_case_brace.c
index caeae178..caeae178 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01005-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01005-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01006-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01006-mod_case_brace.c
index 371bd5cb..371bd5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01006-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01006-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01007-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01007-mod_case_brace.c
index 2ea3dea5..2ea3dea5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01007-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01007-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01008-Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01008-Issue_3366.c
index 75a95e36..75a95e36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01008-Issue_3366.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01008-Issue_3366.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01009-mod_move_case_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01009-mod_move_case_return.c
index 484b4c33..484b4c33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01009-mod_move_case_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01009-mod_move_case_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01010-mod_move_case_return_bad.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01010-mod_move_case_return_bad.c
index c6fa63e8..c6fa63e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01010-mod_move_case_return_bad.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01010-mod_move_case_return_bad.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01011-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01011-semicolons.c
index 962ec588..962ec588 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01011-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01011-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01012-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01012-semicolons.c
index 54d895e7..54d895e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01012-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01012-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01015-paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01015-paren_indent.c
index d993315c..d993315c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01015-paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01015-paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01016-align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01016-align_attr.c
index 012217e4..012217e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01016-align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01016-align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01020-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01020-kw_subst.c
index 61b43c3f..61b43c3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01020-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01020-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01021-hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01021-hello.c
index 6ba46ef7..6ba46ef7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01021-hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01021-hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01022-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01022-kw_subst.c
index 6cba8370..6cba8370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01022-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01022-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01030-multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01030-multi.h
index 14a599c7..14a599c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01030-multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01030-multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01035-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01035-func_wrap.c
index b2f86805..b2f86805 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01035-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01035-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01036-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01036-func_wrap.c
index 24e932ed..24e932ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01036-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01036-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01037-type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01037-type_wrap.c
index c3c23569..c3c23569 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01037-type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01037-type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01040-newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01040-newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01040-newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01040-newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01050-func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01050-func_call_user.c
index 82eba7cb..82eba7cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01050-func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01050-func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01060-backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01060-backslash-newline-lex.c
index f5000b82..f5000b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01060-backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01060-backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01070-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01070-various_colons.c
index 0850b17e..0850b17e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01070-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01070-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01071-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01071-various_colons.c
index e25134ab..e25134ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01071-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01071-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01080-bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01080-bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01080-bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01080-bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02000-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02000-i2c-core.c
index 528a6161..528a6161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02000-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02000-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02001-directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02001-directfb.h
index 3c7ffc18..3c7ffc18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02001-directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02001-directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02002-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02002-i2c-core.c
index 698df2a6..698df2a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02002-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02002-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02003-Issue_3353.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02003-Issue_3353.h
index f189ebfa..f189ebfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02003-Issue_3353.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02003-Issue_3353.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02100-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02100-i2c-core.c
index df01ad5b..df01ad5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02100-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02100-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02101-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02101-comment-indent.c
index 7c5f0f0c..7c5f0f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02101-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02101-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02200-xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02200-xml.c
index 62bd81d0..62bd81d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02200-xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02200-xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02201-align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02201-align-string.c
index 0b2cf25a..0b2cf25a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02201-align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02201-align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02300-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02300-preproc-if.c
index 8e20a744..8e20a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02300-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02300-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02301-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02301-preproc-if.c
index 0130e1f5..0130e1f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02301-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02301-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02302-nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02302-nl-cont.c
index dfbb0c2d..dfbb0c2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02302-nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02302-nl-cont.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02303-nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02303-nl-cont2.c
index a0129423..a0129423 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02303-nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02303-nl-cont2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02310-empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02310-empty-for.c
index 4bd43b09..4bd43b09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02310-empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02310-empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02311-pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02311-pragma.c
index ec944697..ec944697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02311-pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02311-pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02315-pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02315-pp_ret.c
index 18a3d5cb..18a3d5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02315-pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02315-pp_ret.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02320-nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02320-nl_create_one_liner.c
index 55974c3c..55974c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02320-nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02320-nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02325-sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02325-sort_include.c
index 4f2b20bf..4f2b20bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02325-sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02325-sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02330-one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02330-one_liners.c
index 57d8ba44..57d8ba44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02330-one_liners.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02330-one_liners.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02410-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02410-ifdef-indent.c
index e71d8cf3..e71d8cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02410-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02410-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02411-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02411-ifdef-indent.c
index bf39a98c..bf39a98c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02411-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02411-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02412-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02412-ifdef-indent.c
index 23b4dd37..23b4dd37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02412-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02412-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02413-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02413-ifdef-indent.c
index 8738bbf7..8738bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02413-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02413-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02414-whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02414-whole_file_ifdef.c
index c767bbf7..c767bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02414-whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02414-whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02415-endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02415-endif.c
index c8b99a6a..c8b99a6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02415-endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02415-endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02416-cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02416-cmt_nl_end.c
index 56de21ec..56de21ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02416-cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02416-cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02421-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02421-cmt_multi.c
index 61faac36..61faac36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02421-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02421-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02422-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02422-cmt_multi.c
index bbdd79cd..bbdd79cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02422-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02422-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02423-cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02423-cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02423-cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02423-cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02431-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02431-cmt_right_align.c
index 315e5010..315e5010 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02431-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02431-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02432-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02432-cmt_right_align.c
index eef43777..eef43777 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02432-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02432-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02440-string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02440-string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02440-string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02440-string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02441-utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02441-utf8-identifiers.c
index 1dc39e9c..1dc39e9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02441-utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02441-utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02451-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02451-nl_return_expr.c
index bf8621d5..bf8621d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02451-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02451-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02452-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02452-nl_return_expr.c
index 4dc23adf..4dc23adf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02452-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02452-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02453-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02453-nl_return_expr.c
index c917fb17..c917fb17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02453-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02453-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02454-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02454-nl_return_expr.c
index 2e33d2b0..2e33d2b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02454-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02454-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02455-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02455-macro-returns.c
index dba84c56..f85a1663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02455-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02455-macro-returns.c
@@ -1,14 +1,14 @@
 #define foo1 return(x + \
-	            y)
+		    y)
 
 #define foo2 return (x + \
-	             y)
+		     y)
 
 #define foo3 return \
-	        (0)
+		(0)
 
 #define foo4 return \
-	        (0)
+		(0)
 
 #define foo5 return /* empty */
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02456-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02456-macro-returns.c
index 7cd29044..973fdfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02456-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02456-macro-returns.c
@@ -5,10 +5,10 @@
 	       y
 
 #define foo3 return \
-	        0
+		0
 
 #define foo4 return \
-	        0
+		0
 
 #define foo5 return /* empty */
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02457-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02457-nl_before_return.c
index a396202f..a396202f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02457-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02457-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02460-freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02460-freebsd.c
index 804c5ec7..c0af0657 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02460-freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02460-freebsd.c
@@ -89,7 +89,7 @@ main(int argc, char *argv[])
 		stmt2;
 	}
 
-	almod = (chunk_is_single_line_comment(pc) &&
+	almod = (pc->IsSingleLineComment() &&
 	    cpd.settings[UO_indent_relative_single_line_comments].b) ?
 	    ALMODE_KEEP_REL : ALMODE_KEEP_ABS;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02486-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02486-doxy-comment.c
index e2a6c2c4..e2a6c2c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02486-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02486-doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02487-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02487-doxy-comment.c
index 5049dada..5049dada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02487-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02487-doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02501-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02501-custom_types_ssl.c
index 3e28d2e3..3e28d2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02501-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02501-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02502-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02502-custom_types_ssl.c
index 0df5ddad..0df5ddad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02502-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02502-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02504-align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02504-align_keep_extra.c
index 985f428c..985f428c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02504-align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/02505-align_assigns.c
new file mode 100644
index 00000000..dadef510
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02505-align_assigns.c
@@ -0,0 +1,43 @@
+unsigned foo(unsigned in1, unsigned in2, unsigned in3, unsigned in4) {
+	unsigned a     = 0xa;
+	unsigned b     = 0xb;
+	unsigned c     = 0xc;
+	unsigned x[10] = {0};
+	{
+		unsigned xyz = (
+			1
+			+
+			2
+			+
+			3
+			+
+			4
+			+
+			5
+			);
+	}
+	unsigned r1       = in1 * in3;
+	unsigned r2first  = in1 * in4;
+	unsigned r2second = in2 * in3;
+	unsigned r3       = in2 * in4;
+
+	a            ^=
+		b; c += d;
+
+
+
+	a             += (
+		b); c += d;
+
+
+
+	a             += x[
+		0]; c += d;
+
+
+
+	a    += b; {
+	}; c += d;
+
+	return r1 * r2first + r3 * r2second + a * b + 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.76.0/tests/expected/c/02506-align_assign_var_defs.c
new file mode 100644
index 00000000..682982ee
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02506-align_assign_var_defs.c
@@ -0,0 +1,9 @@
+int foo(void) {
+	unsigned a                = 123;
+	unsigned abcde            = 456;
+	unsigned abcdefghijklmnop = 789;
+	unsigned w, x, y, z;
+	unsigned u                = 16730;
+	unsigned vvvvv            = 4917;
+	unsigned wwwwwwwwww       = 12428;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02510-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02510-asm.c
index 6609bf9b..6609bf9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02510-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/02520-pp_indent_with_tabs.c
new file mode 100644
index 00000000..18596a65
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02520-pp_indent_with_tabs.c
@@ -0,0 +1,167 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+int main()
+{
+	if (true)
+	{
+		if (true)
+		{
+			if (true)
+			{
+				if (true)
+				{
+					if (true)
+					{
+						int i = 0;
+					}
+				}
+			}
+		}
+	}
+}
+
+#ifndef OPEN_MAX
+ #ifdef SVR4
+  #define OPEN_MAX 256
+ #else
+  #include <sys/param.h>
+  #ifndef OPEN_MAX
+   #if defined(__OSF1__) || defined(__osf__)
+    #define OPEN_MAX 256
+   #else
+    #ifdef NOFILE
+     #define OPEN_MAX NOFILE
+    #else
+     #if !defined(__EMX__) && !defined(__QNX__)
+      #define OPEN_MAX NOFILES_MAX
+     #else
+      #define OPEN_MAX 256
+      #ifdef NOFILE
+       #define OPEN_MAX NOFILE
+      #else
+       #define OPEN_MAX 256
+       #ifdef NOFILE
+        #define OPEN_MAX NOFILE
+       #endif
+      #endif
+     #endif
+    #endif
+   #endif
+  #endif
+ #endif
+#endif
+
+#ifndef __EMX__
+ #define XTRANSDEBUG 1
+#else
+ #define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ #define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ #include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ #ifndef MINIX
+  #ifndef Lynx
+   #include <sys/socket.h>
+  #else
+   #include <socket.h>
+  #endif
+  #include <netinet/in.h>
+  #include <arpa/inet.h>
+ #endif
+ #ifdef __EMX__
+  #include <sys/ioctl.h>
+ #endif
+
+ #if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+  #ifndef NEED_UTSNAME
+   #define NEED_UTSNAME
+  #endif
+  #include <sys/utsname.h>
+ #endif
+
+ #ifndef TRANS_OPEN_MAX
+
+  #ifndef X_NOT_POSIX
+   #ifdef _POSIX_SOURCE
+    #include <limits.h>
+   #else
+    #define _POSIX_SOURCE
+    #include <limits.h>
+    #undef _POSIX_SOURCE
+   #endif
+  #endif
+  #ifndef OPEN_MAX
+   #ifdef __GNU__
+    #define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+   #endif
+   #ifdef SVR4
+    #define OPEN_MAX 256
+   #else
+    #include <sys/param.h>
+    #ifndef OPEN_MAX
+     #if defined(__OSF1__) || defined(__osf__)
+      #define OPEN_MAX 256
+     #else
+      #ifdef NOFILE
+       #define OPEN_MAX NOFILE
+      #else
+       #if !defined(__EMX__) && !defined(__QNX__)
+        #define OPEN_MAX NOFILES_MAX
+       #else
+        #define OPEN_MAX 256
+       #endif
+      #endif
+     #endif
+    #endif
+   #endif
+  #endif
+  #ifdef __GNU__
+   #define TRANS_OPEN_MAX OPEN_MAX
+  #elif OPEN_MAX > 256
+   #define TRANS_OPEN_MAX 256
+  #else
+   #define TRANS_OPEN_MAX OPEN_MAX
+  #endif /*__GNU__*/
+
+ #endif /* TRANS_OPEN_MAX */
+
+ #ifdef __EMX__
+  #define ESET(val)
+ #else
+  #define ESET(val) errno = val
+ #endif
+ #define EGET() errno
+
+#else /* _WIN32 */
+
+ #include <limits.h>    /* for USHRT_MAX */
+
+ #define ESET(val) WSASetLastError(val)
+ #define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ #define NULL 0
+#endif
+
+#ifdef X11_t
+ #define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/02521-pp_indent_with_tabs.c
new file mode 100644
index 00000000..dbf66a9e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02521-pp_indent_with_tabs.c
@@ -0,0 +1,167 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+int main()
+{
+	if (true)
+	{
+		if (true)
+		{
+			if (true)
+			{
+				if (true)
+				{
+					if (true)
+					{
+						int i = 0;
+					}
+				}
+			}
+		}
+	}
+}
+
+#ifndef OPEN_MAX
+ #ifdef SVR4
+	#define OPEN_MAX 256
+ #else
+	#include <sys/param.h>
+	#ifndef OPEN_MAX
+	 #if defined(__OSF1__) || defined(__osf__)
+		#define OPEN_MAX 256
+	 #else
+		#ifdef NOFILE
+		 #define OPEN_MAX NOFILE
+		#else
+		 #if !defined(__EMX__) && !defined(__QNX__)
+			#define OPEN_MAX NOFILES_MAX
+		 #else
+			#define OPEN_MAX 256
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #define OPEN_MAX 256
+			 #ifdef NOFILE
+				#define OPEN_MAX NOFILE
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+ #endif
+#endif
+
+#ifndef __EMX__
+ #define XTRANSDEBUG 1
+#else
+ #define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ #define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ #include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ #ifndef MINIX
+	#ifndef Lynx
+	 #include <sys/socket.h>
+	#else
+	 #include <socket.h>
+	#endif
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+ #endif
+ #ifdef __EMX__
+	#include <sys/ioctl.h>
+ #endif
+
+ #if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+	#ifndef NEED_UTSNAME
+	 #define NEED_UTSNAME
+	#endif
+	#include <sys/utsname.h>
+ #endif
+
+ #ifndef TRANS_OPEN_MAX
+
+	#ifndef X_NOT_POSIX
+	 #ifdef _POSIX_SOURCE
+		#include <limits.h>
+	 #else
+		#define _POSIX_SOURCE
+		#include <limits.h>
+		#undef _POSIX_SOURCE
+	 #endif
+	#endif
+	#ifndef OPEN_MAX
+	 #ifdef __GNU__
+		#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+	 #endif
+	 #ifdef SVR4
+		#define OPEN_MAX 256
+	 #else
+		#include <sys/param.h>
+		#ifndef OPEN_MAX
+		 #if defined(__OSF1__) || defined(__osf__)
+			#define OPEN_MAX 256
+		 #else
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #if !defined(__EMX__) && !defined(__QNX__)
+				#define OPEN_MAX NOFILES_MAX
+			 #else
+				#define OPEN_MAX 256
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+	#ifdef __GNU__
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#elif OPEN_MAX > 256
+	 #define TRANS_OPEN_MAX 256
+	#else
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#endif /*__GNU__*/
+
+ #endif /* TRANS_OPEN_MAX */
+
+ #ifdef __EMX__
+	#define ESET(val)
+ #else
+	#define ESET(val) errno = val
+ #endif
+ #define EGET() errno
+
+#else /* _WIN32 */
+
+ #include <limits.h>    /* for USHRT_MAX */
+
+ #define ESET(val) WSASetLastError(val)
+ #define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ #define NULL 0
+#endif
+
+#ifdef X11_t
+ #define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/02522-pp_indent_with_tabs.c
new file mode 100644
index 00000000..dbf66a9e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02522-pp_indent_with_tabs.c
@@ -0,0 +1,167 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+int main()
+{
+	if (true)
+	{
+		if (true)
+		{
+			if (true)
+			{
+				if (true)
+				{
+					if (true)
+					{
+						int i = 0;
+					}
+				}
+			}
+		}
+	}
+}
+
+#ifndef OPEN_MAX
+ #ifdef SVR4
+	#define OPEN_MAX 256
+ #else
+	#include <sys/param.h>
+	#ifndef OPEN_MAX
+	 #if defined(__OSF1__) || defined(__osf__)
+		#define OPEN_MAX 256
+	 #else
+		#ifdef NOFILE
+		 #define OPEN_MAX NOFILE
+		#else
+		 #if !defined(__EMX__) && !defined(__QNX__)
+			#define OPEN_MAX NOFILES_MAX
+		 #else
+			#define OPEN_MAX 256
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #define OPEN_MAX 256
+			 #ifdef NOFILE
+				#define OPEN_MAX NOFILE
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+ #endif
+#endif
+
+#ifndef __EMX__
+ #define XTRANSDEBUG 1
+#else
+ #define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ #define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ #include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ #ifndef MINIX
+	#ifndef Lynx
+	 #include <sys/socket.h>
+	#else
+	 #include <socket.h>
+	#endif
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+ #endif
+ #ifdef __EMX__
+	#include <sys/ioctl.h>
+ #endif
+
+ #if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+	#ifndef NEED_UTSNAME
+	 #define NEED_UTSNAME
+	#endif
+	#include <sys/utsname.h>
+ #endif
+
+ #ifndef TRANS_OPEN_MAX
+
+	#ifndef X_NOT_POSIX
+	 #ifdef _POSIX_SOURCE
+		#include <limits.h>
+	 #else
+		#define _POSIX_SOURCE
+		#include <limits.h>
+		#undef _POSIX_SOURCE
+	 #endif
+	#endif
+	#ifndef OPEN_MAX
+	 #ifdef __GNU__
+		#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+	 #endif
+	 #ifdef SVR4
+		#define OPEN_MAX 256
+	 #else
+		#include <sys/param.h>
+		#ifndef OPEN_MAX
+		 #if defined(__OSF1__) || defined(__osf__)
+			#define OPEN_MAX 256
+		 #else
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #if !defined(__EMX__) && !defined(__QNX__)
+				#define OPEN_MAX NOFILES_MAX
+			 #else
+				#define OPEN_MAX 256
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+	#ifdef __GNU__
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#elif OPEN_MAX > 256
+	 #define TRANS_OPEN_MAX 256
+	#else
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#endif /*__GNU__*/
+
+ #endif /* TRANS_OPEN_MAX */
+
+ #ifdef __EMX__
+	#define ESET(val)
+ #else
+	#define ESET(val) errno = val
+ #endif
+ #define EGET() errno
+
+#else /* _WIN32 */
+
+ #include <limits.h>    /* for USHRT_MAX */
+
+ #define ESET(val) WSASetLastError(val)
+ #define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ #define NULL 0
+#endif
+
+#ifdef X11_t
+ #define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/02523-pp_indent_with_tabs.c
new file mode 100644
index 00000000..85cee37d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02523-pp_indent_with_tabs.c
@@ -0,0 +1,167 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+int main()
+{
+  if (true)
+  {
+    if (true)
+    {
+      if (true)
+      {
+        if (true)
+        {
+          if (true)
+          {
+            int i = 0;
+          }
+        }
+      }
+    }
+  }
+}
+
+#ifndef OPEN_MAX
+ #ifdef SVR4
+  #define OPEN_MAX 256
+ #else
+  #include <sys/param.h>
+  #ifndef OPEN_MAX
+   #if defined(__OSF1__) || defined(__osf__)
+    #define OPEN_MAX 256
+   #else
+    #ifdef NOFILE
+     #define OPEN_MAX NOFILE
+    #else
+     #if !defined(__EMX__) && !defined(__QNX__)
+      #define OPEN_MAX NOFILES_MAX
+     #else
+      #define OPEN_MAX 256
+      #ifdef NOFILE
+       #define OPEN_MAX NOFILE
+      #else
+       #define OPEN_MAX 256
+       #ifdef NOFILE
+        #define OPEN_MAX NOFILE
+       #endif
+      #endif
+     #endif
+    #endif
+   #endif
+  #endif
+ #endif
+#endif
+
+#ifndef __EMX__
+ #define XTRANSDEBUG 1
+#else
+ #define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ #define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ #include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ #ifndef MINIX
+  #ifndef Lynx
+   #include <sys/socket.h>
+  #else
+   #include <socket.h>
+  #endif
+  #include <netinet/in.h>
+  #include <arpa/inet.h>
+ #endif
+ #ifdef __EMX__
+  #include <sys/ioctl.h>
+ #endif
+
+ #if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+  #ifndef NEED_UTSNAME
+   #define NEED_UTSNAME
+  #endif
+  #include <sys/utsname.h>
+ #endif
+
+ #ifndef TRANS_OPEN_MAX
+
+  #ifndef X_NOT_POSIX
+   #ifdef _POSIX_SOURCE
+    #include <limits.h>
+   #else
+    #define _POSIX_SOURCE
+    #include <limits.h>
+    #undef _POSIX_SOURCE
+   #endif
+  #endif
+  #ifndef OPEN_MAX
+   #ifdef __GNU__
+    #define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+   #endif
+   #ifdef SVR4
+    #define OPEN_MAX 256
+   #else
+    #include <sys/param.h>
+    #ifndef OPEN_MAX
+     #if defined(__OSF1__) || defined(__osf__)
+      #define OPEN_MAX 256
+     #else
+      #ifdef NOFILE
+       #define OPEN_MAX NOFILE
+      #else
+       #if !defined(__EMX__) && !defined(__QNX__)
+        #define OPEN_MAX NOFILES_MAX
+       #else
+        #define OPEN_MAX 256
+       #endif
+      #endif
+     #endif
+    #endif
+   #endif
+  #endif
+  #ifdef __GNU__
+   #define TRANS_OPEN_MAX OPEN_MAX
+  #elif OPEN_MAX > 256
+   #define TRANS_OPEN_MAX 256
+  #else
+   #define TRANS_OPEN_MAX OPEN_MAX
+  #endif /*__GNU__*/
+
+ #endif /* TRANS_OPEN_MAX */
+
+ #ifdef __EMX__
+  #define ESET(val)
+ #else
+  #define ESET(val) errno = val
+ #endif
+ #define EGET() errno
+
+#else /* _WIN32 */
+
+ #include <limits.h>    /* for USHRT_MAX */
+
+ #define ESET(val) WSASetLastError(val)
+ #define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ #define NULL 0
+#endif
+
+#ifdef X11_t
+ #define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/02524-pp_indent_with_tabs.c
new file mode 100644
index 00000000..dbf66a9e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02524-pp_indent_with_tabs.c
@@ -0,0 +1,167 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+int main()
+{
+	if (true)
+	{
+		if (true)
+		{
+			if (true)
+			{
+				if (true)
+				{
+					if (true)
+					{
+						int i = 0;
+					}
+				}
+			}
+		}
+	}
+}
+
+#ifndef OPEN_MAX
+ #ifdef SVR4
+	#define OPEN_MAX 256
+ #else
+	#include <sys/param.h>
+	#ifndef OPEN_MAX
+	 #if defined(__OSF1__) || defined(__osf__)
+		#define OPEN_MAX 256
+	 #else
+		#ifdef NOFILE
+		 #define OPEN_MAX NOFILE
+		#else
+		 #if !defined(__EMX__) && !defined(__QNX__)
+			#define OPEN_MAX NOFILES_MAX
+		 #else
+			#define OPEN_MAX 256
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #define OPEN_MAX 256
+			 #ifdef NOFILE
+				#define OPEN_MAX NOFILE
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+ #endif
+#endif
+
+#ifndef __EMX__
+ #define XTRANSDEBUG 1
+#else
+ #define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ #define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ #include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ #ifndef MINIX
+	#ifndef Lynx
+	 #include <sys/socket.h>
+	#else
+	 #include <socket.h>
+	#endif
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+ #endif
+ #ifdef __EMX__
+	#include <sys/ioctl.h>
+ #endif
+
+ #if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+	#ifndef NEED_UTSNAME
+	 #define NEED_UTSNAME
+	#endif
+	#include <sys/utsname.h>
+ #endif
+
+ #ifndef TRANS_OPEN_MAX
+
+	#ifndef X_NOT_POSIX
+	 #ifdef _POSIX_SOURCE
+		#include <limits.h>
+	 #else
+		#define _POSIX_SOURCE
+		#include <limits.h>
+		#undef _POSIX_SOURCE
+	 #endif
+	#endif
+	#ifndef OPEN_MAX
+	 #ifdef __GNU__
+		#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+	 #endif
+	 #ifdef SVR4
+		#define OPEN_MAX 256
+	 #else
+		#include <sys/param.h>
+		#ifndef OPEN_MAX
+		 #if defined(__OSF1__) || defined(__osf__)
+			#define OPEN_MAX 256
+		 #else
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #if !defined(__EMX__) && !defined(__QNX__)
+				#define OPEN_MAX NOFILES_MAX
+			 #else
+				#define OPEN_MAX 256
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+	#ifdef __GNU__
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#elif OPEN_MAX > 256
+	 #define TRANS_OPEN_MAX 256
+	#else
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#endif /*__GNU__*/
+
+ #endif /* TRANS_OPEN_MAX */
+
+ #ifdef __EMX__
+	#define ESET(val)
+ #else
+	#define ESET(val) errno = val
+ #endif
+ #define EGET() errno
+
+#else /* _WIN32 */
+
+ #include <limits.h>    /* for USHRT_MAX */
+
+ #define ESET(val) WSASetLastError(val)
+ #define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ #define NULL 0
+#endif
+
+#ifdef X11_t
+ #define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/02525-pp_indent_with_tabs.c
new file mode 100644
index 00000000..dbf66a9e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02525-pp_indent_with_tabs.c
@@ -0,0 +1,167 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+int main()
+{
+	if (true)
+	{
+		if (true)
+		{
+			if (true)
+			{
+				if (true)
+				{
+					if (true)
+					{
+						int i = 0;
+					}
+				}
+			}
+		}
+	}
+}
+
+#ifndef OPEN_MAX
+ #ifdef SVR4
+	#define OPEN_MAX 256
+ #else
+	#include <sys/param.h>
+	#ifndef OPEN_MAX
+	 #if defined(__OSF1__) || defined(__osf__)
+		#define OPEN_MAX 256
+	 #else
+		#ifdef NOFILE
+		 #define OPEN_MAX NOFILE
+		#else
+		 #if !defined(__EMX__) && !defined(__QNX__)
+			#define OPEN_MAX NOFILES_MAX
+		 #else
+			#define OPEN_MAX 256
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #define OPEN_MAX 256
+			 #ifdef NOFILE
+				#define OPEN_MAX NOFILE
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+ #endif
+#endif
+
+#ifndef __EMX__
+ #define XTRANSDEBUG 1
+#else
+ #define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+ #define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+ #include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int errno;               /* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+ #ifndef MINIX
+	#ifndef Lynx
+	 #include <sys/socket.h>
+	#else
+	 #include <socket.h>
+	#endif
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+ #endif
+ #ifdef __EMX__
+	#include <sys/ioctl.h>
+ #endif
+
+ #if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+	#ifndef NEED_UTSNAME
+	 #define NEED_UTSNAME
+	#endif
+	#include <sys/utsname.h>
+ #endif
+
+ #ifndef TRANS_OPEN_MAX
+
+	#ifndef X_NOT_POSIX
+	 #ifdef _POSIX_SOURCE
+		#include <limits.h>
+	 #else
+		#define _POSIX_SOURCE
+		#include <limits.h>
+		#undef _POSIX_SOURCE
+	 #endif
+	#endif
+	#ifndef OPEN_MAX
+	 #ifdef __GNU__
+		#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+	 #endif
+	 #ifdef SVR4
+		#define OPEN_MAX 256
+	 #else
+		#include <sys/param.h>
+		#ifndef OPEN_MAX
+		 #if defined(__OSF1__) || defined(__osf__)
+			#define OPEN_MAX 256
+		 #else
+			#ifdef NOFILE
+			 #define OPEN_MAX NOFILE
+			#else
+			 #if !defined(__EMX__) && !defined(__QNX__)
+				#define OPEN_MAX NOFILES_MAX
+			 #else
+				#define OPEN_MAX 256
+			 #endif
+			#endif
+		 #endif
+		#endif
+	 #endif
+	#endif
+	#ifdef __GNU__
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#elif OPEN_MAX > 256
+	 #define TRANS_OPEN_MAX 256
+	#else
+	 #define TRANS_OPEN_MAX OPEN_MAX
+	#endif /*__GNU__*/
+
+ #endif /* TRANS_OPEN_MAX */
+
+ #ifdef __EMX__
+	#define ESET(val)
+ #else
+	#define ESET(val) errno = val
+ #endif
+ #define EGET() errno
+
+#else /* _WIN32 */
+
+ #include <limits.h>    /* for USHRT_MAX */
+
+ #define ESET(val) WSASetLastError(val)
+ #define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+ #define NULL 0
+#endif
+
+#ifdef X11_t
+ #define X_TCP_PORT      6000
+#endif
+
+#endif
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.76.0/tests/expected/c/02530-pp_multiline_define.c
new file mode 100644
index 00000000..24b840f3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02530-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02531-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02531-pp_multiline_define.c
new file mode 100644
index 00000000..b73bb9af
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02531-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02532-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02532-pp_multiline_define.c
new file mode 100644
index 00000000..780d71e1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02532-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02533-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02533-pp_multiline_define.c
new file mode 100644
index 00000000..088418e7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02533-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02534-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02534-pp_multiline_define.c
new file mode 100644
index 00000000..81837e7c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02534-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02535-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02535-pp_multiline_define.c
new file mode 100644
index 00000000..04375283
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02535-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02536-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02536-pp_multiline_define.c
new file mode 100644
index 00000000..490510ac
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02536-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02537-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02537-pp_multiline_define.c
new file mode 100644
index 00000000..9cca3cc8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02537-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02538-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02538-pp_multiline_define.c
new file mode 100644
index 00000000..649c473e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02538-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02539-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02539-pp_multiline_define.c
new file mode 100644
index 00000000..e437aa73
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02539-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02540-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02540-pp_multiline_define.c
new file mode 100644
index 00000000..ab382e23
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02540-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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/02541-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02541-pp_multiline_define.c
new file mode 100644
index 00000000..37db1457
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02541-pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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.76.0/tests/expected/c/02550-func_var_multi_paren.c
new file mode 100644
index 00000000..aefbde49
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02550-func_var_multi_paren.c
@@ -0,0 +1,3 @@
+#define DEFINE_SYMBOL(ret, fn, ...)   ret (*OVERRIDE_SYMBOL(fn))(__VA_ARGS__)
+#define DEFINE_SYMBOL(ret, fn, ...)   ret (*OVERRIDE_SYMBOL(OVERRIDE_SYMBOL2(fn)))(__VA_ARGS__)
+#define DEFINE_SYMBOL(ret, fn, ...)   ret (*OVERRIDE_SYMBOL(fn)())(__VA_ARGS__)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/07630-indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/07630-indent-vbrace.c
index a1344348..a1344348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/07630-indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/07630-indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/08399-gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/08399-gh399.c
index 780234ab..780234ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/08399-gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/08399-gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09588-sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09588-sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09588-sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09588-sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09594-sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09594-sf594.c
index 94a1973c..94a1973c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09594-sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09594-sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09601-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09601-sp_after_sparen.c
index 93cbfea2..93cbfea2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09601-sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09601-sp_after_sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09602-bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09602-bug_671.c
index a9d54ee8..a9d54ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09602-bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09602-bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09603-indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09603-indent_ternary-1.c
index f9200886..f9200886 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09603-indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09603-indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09604-indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09604-indent_ternary-2.c
index e6d3576c..e6d3576c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09604-indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09604-indent_ternary-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09605-negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09605-negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09605-negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09605-negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09606-extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09606-extern.c
index d43131fe..d43131fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09606-extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09606-extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09607-attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09607-attribute.c
index 19e3a057..19e3a057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09607-attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09607-attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09608-func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09608-func_call_user2.c
index ee4e24d4..ee4e24d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09608-func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09608-func_call_user2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09609-Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09609-Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09609-Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09609-Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09610-bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09610-bug_i_876.c
index e1afece6..e1afece6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09610-bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09610-bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09611-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09611-bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09611-bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09611-bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09612-bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09612-bug_1041.c
index 7c07615b..7c07615b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09612-bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09612-bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09613-i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09613-i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09613-i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09613-i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09614-string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09614-string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09614-string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09614-string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09615-i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09615-i1564.c
index 2b37b25c..2b37b25c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09615-i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09615-i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09616-enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09616-enum_comma_ifdef.c
index 95637aae..95637aae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09616-enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09616-enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09617-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09617-Issue_2360.c
index 0489b0f9..0489b0f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09617-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09617-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09618-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09618-Issue_2360.c
index 898c64e6..898c64e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09618-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09618-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09619-Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09619-Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09619-Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09619-Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09620-Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09620-Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09620-Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09620-Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09621-pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09621-pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09621-pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09621-pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09622-Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09622-Issue_3356.c
index 7f1e0282..7f1e0282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09622-Issue_3356.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/09623-vbrace_one_liner.c
new file mode 100644
index 00000000..bff114d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09623-vbrace_one_liner.c
@@ -0,0 +1,9 @@
+unsigned a;
+
+int foo(void) {
+	if (a == 1) { printf("It's 1\n"); }
+}
+
+int bar(void) {
+	if (a == 2) { printf("It's 2\n"); } /* comment */
+}
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.76.0/tests/expected/c/10003-incdec_postfix_multiply.c
new file mode 100644
index 00000000..51c2b3a3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10003-incdec_postfix_multiply.c
@@ -0,0 +1 @@
+unsigned result = *var++ * int(0x1111);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10004-pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10004-pragma_asm.c
index 0e6b48d6..0e6b48d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10004-pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10004-pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10005-i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10005-i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10005-i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10005-i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10006-bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10006-bug_2331.c
index 67088d94..67088d94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10006-bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10006-bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10007-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10007-indent-macro-brace.c
index 192a399f..192a399f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10007-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10007-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10008-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10008-indent-macro-brace.c
index a54cd504..a54cd504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10008-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10008-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10009-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10009-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10009-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10009-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10010-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10010-return-compound-literal.c
index da33e2fd..da33e2fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10010-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10010-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10011-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10011-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10011-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10011-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10012-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10012-sparen-indent.c
index d9ddbe06..d9ddbe06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10012-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10012-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10013-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10013-sparen-indent.c
index b09a3102..b09a3102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10013-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10013-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10014-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10014-sparen-indent.c
index bf0ba8cf..bf0ba8cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10014-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10014-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10015-Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10015-Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10015-Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10015-Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10016-Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10016-Issue_3233.c
index ccb53151..ccb53151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10016-Issue_3233.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10016-Issue_3233.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10017-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10017-double-sparen.c
index 6633006e..6633006e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10017-double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10017-double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10018-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10018-double-sparen.c
index f77262fe..f77262fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10018-double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10018-double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10019-include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10019-include-guard.h
index e742dd4c..e742dd4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10019-include-guard.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10019-include-guard.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10020-single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10020-single_line_comment_after.c
index 527b3e80..527b3e80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10020-single_line_comment_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10020-single_line_comment_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10021-parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10021-parenthesized_indirect_call.c
index 7fd4d573..7fd4d573 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10021-parenthesized_indirect_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10021-parenthesized_indirect_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10022-Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10022-Issue_3269.c
index 6baef61c..6baef61c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10022-Issue_3269.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10022-Issue_3269.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10023-Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10023-Issue_3272.h
index 673c5a91..673c5a91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10023-Issue_3272.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10023-Issue_3272.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10024-Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10024-Issue_3274.c
index f8b9f789..f8b9f789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10024-Issue_3274.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10024-Issue_3274.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10025-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10025-forever.c
index fc14ccf1..fc14ccf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10025-forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10025-forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10026-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10026-forever.c
index 94dc8ce1..94dc8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10026-forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10026-forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10027-Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10027-Issue_3327.c
index 92ec0779..92ec0779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10027-Issue_3327.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10027-Issue_3327.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10028-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10028-Issue_3339.c
index fa6872e4..fa6872e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10028-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10028-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10029-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10029-Issue_3339.c
index 0b9b50e1..0b9b50e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10029-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10029-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10030-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10030-Issue_3339.c
index fb71b266..fb71b266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10030-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10030-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10031-Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10031-Issue_3342.c
index 986aab70..986aab70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10031-Issue_3342.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10031-Issue_3342.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10032-Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10032-Issue_3345.c
index eec63b28..eec63b28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10032-Issue_3345.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10032-Issue_3345.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10033-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10033-Issue_3343.c
index 6acdb70e..6acdb70e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10033-Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10033-Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10034-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10034-Issue_3343.c
index 31eddc22..31eddc22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10034-Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10034-Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10035-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10035-comment-indent.c
index 4486816e..4486816e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10035-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10035-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10036-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10036-comment-indent.c
index 9ac0677f..9ac0677f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10036-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10036-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10037-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10037-Issue_3362.c
index abff8de4..abff8de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10037-Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10037-Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10038-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10038-Issue_3362.c
index 7a8c08f3..7a8c08f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10038-Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10038-Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10039-Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10039-Issue_3370.c
index 2586a3b4..2586a3b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10039-Issue_3370.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10039-Issue_3370.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10040-Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10040-Issue_3377.c
index fc4aa694..fc4aa694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10040-Issue_3377.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10040-Issue_3377.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10041-Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10041-Issue_3351.c
index 592fc511..592fc511 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10041-Issue_3351.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10041-Issue_3351.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10042-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10042-Issue_3376.c
index 084e9c7d..084e9c7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10042-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10042-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10043-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10043-Issue_3376.c
index 6874a984..6874a984 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10043-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10043-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10044-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10044-Issue_3376.c
index b6ea490d..b6ea490d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10044-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10044-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10045-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10045-Issue_3376.c
index fa3776db..fa3776db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10045-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10045-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10046-Issue_3402.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10046-Issue_3402.c
index 03f5b5bb..03f5b5bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10046-Issue_3402.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10046-Issue_3402.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10047-Issue_3421.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10047-Issue_3421.h
index cdc3b4f0..cdc3b4f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10047-Issue_3421.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10047-Issue_3421.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10048-Issue_3431.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10048-Issue_3431.c
index 1af6603e..1af6603e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10048-Issue_3431.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10048-Issue_3431.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10049-Issue_3436.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10049-Issue_3436.c
index d921d9ed..d921d9ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10049-Issue_3436.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10049-Issue_3436.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10050-Issue_3192.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10050-Issue_3192.c
index a6ff66a2..a6ff66a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10050-Issue_3192.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10050-Issue_3192.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10051-Issue_3454.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10051-Issue_3454.c
index 8be230dd..8be230dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10051-Issue_3454.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10051-Issue_3454.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10052-Issue_3472.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10052-Issue_3472.c
index d180a700..d180a700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10052-Issue_3472.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10052-Issue_3472.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10053-Issue_3476.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10053-Issue_3476.c
index 92a7b0c0..92a7b0c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10053-Issue_3476.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10053-Issue_3476.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10054-Issue_3480.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10054-Issue_3480.c
index 6a25879a..6a25879a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10054-Issue_3480.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10054-Issue_3480.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10055-Issue_3493.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10055-Issue_3493.c
index 66554d57..66554d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10055-Issue_3493.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10055-Issue_3493.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10056-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10056-Issue_3496.h
index b0509bd5..b0509bd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10056-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10056-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10057-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10057-Issue_3496.h
index 23fbf3b8..23fbf3b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10057-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10057-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10058-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10058-Issue_3496.h
index 3f056c45..3f056c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10058-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10058-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10059-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10059-Issue_3496.h
index f914f255..f914f255 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10059-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10059-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10060-Issue_3548.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10060-Issue_3548.c
index 71824adc..71824adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10060-Issue_3548.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10060-Issue_3548.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10061-Issue_3556.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10061-Issue_3556.c
index 423e07f0..423e07f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10061-Issue_3556.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10061-Issue_3556.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10062-Issue_3561.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10062-Issue_3561.c
index db5c5afc..db5c5afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10062-Issue_3561.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10062-Issue_3561.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10063-Issue_3565.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10063-Issue_3565.c
index 267e25bd..267e25bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10063-Issue_3565.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10063-Issue_3565.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10064-Issue_3567.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10064-Issue_3567.c
index a56a513c..a56a513c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10064-Issue_3567.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10064-Issue_3567.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10065-Issue_3567.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10065-Issue_3567.c
index 3538b0f6..3538b0f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10065-Issue_3567.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10065-Issue_3567.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10066-Issue_3580.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10066-Issue_3580.c
index c2baeb12..c2baeb12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10066-Issue_3580.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10066-Issue_3580.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10077-Issue_3582.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10077-Issue_3582.c
index 65cd5354..65cd5354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10077-Issue_3582.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10077-Issue_3582.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10078-Issue_3587.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10078-Issue_3587.h
index 3744884f..3744884f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10078-Issue_3587.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/c/10079-Issue_3662.c
new file mode 100644
index 00000000..f27f37e9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10079-Issue_3662.c
@@ -0,0 +1,12 @@
+#define emit /* syntactic sugar, like in Qt */
+
+void some_signal(int* x)
+{
+}
+
+int main(void)
+{
+	int x;
+	emit some_signal(&x);
+	return 0;
+}
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.76.0/tests/expected/c/10080-infinite-loops.c
new file mode 100644
index 00000000..71d52db7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10080-infinite-loops.c
@@ -0,0 +1,139 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	for (;;)
+	{
+	}
+
+	while (true)
+	{
+	}
+
+	do
+	{
+	}
+	while (true);
+
+	while (1)
+	{
+	}
+
+	do
+	{
+	}
+	while (1);
+
+
+	/* Braces on the same lines as the keywords */
+
+	for (;;) {
+	}
+
+	while (true) {
+	}
+
+	do {
+	} while (true);
+
+	while (1) {
+	}
+
+	do {
+	} while (1);
+
+
+	/* Braces but everything on one line */
+
+	for (;;) {}
+
+	while (true) {}
+
+	do {} while (true);
+
+	while (1) {}
+
+	do {} while (1);
+
+
+	/* No braces */
+
+	for (;;)
+		x++;
+
+	while (true)
+		x++;
+
+	do
+		x++;
+	while (true);
+
+	while (1)
+		x++;
+
+	do
+		x++;
+	while (1);
+
+
+	/* No braces and everything on one line */
+
+	for (;;) x++;
+
+	while (true) x++;
+
+	do x++; while (true);
+
+	while (1) x++;
+
+	do x++; while (1);
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ for(;;)
+		x++;
+
+	for(;;) // comment
+		x++;
+
+	do // comment
+		x++;
+	while (1); // comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10081-infinite-loops.c
new file mode 100644
index 00000000..0505f2a5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10081-infinite-loops.c
@@ -0,0 +1,135 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	for (;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+
+	/* Braces on the same lines as the keywords */
+
+	for (;;) {
+	}
+
+	for(;;)     {
+	}
+
+	for(;;) {
+	}
+
+	for(;;)  {
+	}
+
+	for(;;) {
+	}
+
+
+	/* Braces but everything on one line */
+
+	for (;;) {}
+
+	for(;;)     {}
+
+	for(;;) {}
+
+	for(;;)  {}
+
+	for(;;) {}
+
+
+	/* No braces */
+
+	for (;;)
+		x++;
+
+	for(;;)
+		x++;
+
+	for(;;)
+		x++;
+
+	for(;;)
+		x++;
+
+	for(;;)
+		x++;
+
+
+	/* No braces and everything on one line */
+
+	for (;;) x++;
+
+	for(;;) x++;
+
+	for(;;) x++;
+
+	for(;;) x++;
+
+	for(;;) x++;
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ for(;;)
+		x++;
+
+	for(;;) // comment
+		x++;
+
+	for(;;) // comment
+		x++;
+	// comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10082-infinite-loops.c
new file mode 100644
index 00000000..1dd02553
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10082-infinite-loops.c
@@ -0,0 +1,135 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	while(true)
+	{
+	}
+
+	while (true)
+	{
+	}
+
+	while(true)
+	{
+	}
+
+	while(true)
+	{
+	}
+
+	while(true)
+	{
+	}
+
+
+	/* Braces on the same lines as the keywords */
+
+	while(true) {
+	}
+
+	while (true) {
+	}
+
+	while(true) {
+	}
+
+	while(true) {
+	}
+
+	while(true) {
+	}
+
+
+	/* Braces but everything on one line */
+
+	while(true) {}
+
+	while (true) {}
+
+	while(true) {}
+
+	while(true) {}
+
+	while(true) {}
+
+
+	/* No braces */
+
+	while(true)
+		x++;
+
+	while (true)
+		x++;
+
+	while(true)
+		x++;
+
+	while(true)
+		x++;
+
+	while(true)
+		x++;
+
+
+	/* No braces and everything on one line */
+
+	while(true) x++;
+
+	while (true) x++;
+
+	while(true) x++;
+
+	while(true) x++;
+
+	while(true) x++;
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ while(true)
+		x++;
+
+	while(true) // comment
+		x++;
+
+	while(true) // comment
+		x++;
+	// comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10083-infinite-loops.c
new file mode 100644
index 00000000..0d514c0f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10083-infinite-loops.c
@@ -0,0 +1,147 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	do
+	{
+	}while(true);
+
+	do
+	{
+	}while(true);
+
+	do
+	{
+	}
+	while (true);
+
+	do
+	{
+	}while(true);
+
+	do
+	{
+	}
+	while(true);
+
+
+	/* Braces on the same lines as the keywords */
+
+	do       {
+	}while(true);
+
+	do           {
+	}while(true);
+
+	do {
+	} while (true);
+
+	do        {
+	}while(true);
+
+	do {
+	} while(true);
+
+
+	/* Braces but everything on one line */
+
+	do       {}while(true);
+
+	do           {}while(true);
+
+	do {} while (true);
+
+	do        {}while(true);
+
+	do {} while(true);
+
+
+	/* No braces */
+
+	do
+		x++;
+	while(true);
+
+	do
+		x++;
+	while(true);
+
+	do
+		x++;
+	while (true);
+
+	do
+		x++;
+	while(true);
+
+	do
+		x++;
+	while(true);
+
+
+	/* No braces and everything on one line */
+
+	do x++;
+	while(true);
+
+	do x++;
+	while(true);
+
+	do x++; while (true);
+
+	do x++;
+	while(true);
+
+	do x++; while(true);
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ do
+		x++;
+	while(true);
+
+	do      // comment
+		x++;
+	while(true);
+
+	do // comment
+		x++;
+	while(true); // comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10084-infinite-loops.c
new file mode 100644
index 00000000..1f2eccdd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10084-infinite-loops.c
@@ -0,0 +1,135 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	while(1)
+	{
+	}
+
+	while(1)
+	{
+	}
+
+	while(1)
+	{
+	}
+
+	while (1)
+	{
+	}
+
+	while(1)
+	{
+	}
+
+
+	/* Braces on the same lines as the keywords */
+
+	while(1) {
+	}
+
+	while(1)   {
+	}
+
+	while(1) {
+	}
+
+	while (1) {
+	}
+
+	while(1) {
+	}
+
+
+	/* Braces but everything on one line */
+
+	while(1) {}
+
+	while(1)   {}
+
+	while(1) {}
+
+	while (1) {}
+
+	while(1) {}
+
+
+	/* No braces */
+
+	while(1)
+		x++;
+
+	while(1)
+		x++;
+
+	while(1)
+		x++;
+
+	while (1)
+		x++;
+
+	while(1)
+		x++;
+
+
+	/* No braces and everything on one line */
+
+	while(1) x++;
+
+	while(1) x++;
+
+	while(1) x++;
+
+	while (1) x++;
+
+	while(1) x++;
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ while(1)
+		x++;
+
+	while(1) // comment
+		x++;
+
+	while(1) // comment
+		x++;
+	// comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 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.76.0/tests/expected/c/10085-infinite-loops.c
new file mode 100644
index 00000000..45841c76
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10085-infinite-loops.c
@@ -0,0 +1,147 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	do
+	{
+	}while(1);
+
+	do
+	{
+	}while(1);
+
+	do
+	{
+	}
+	while(1);
+
+	do
+	{
+	}while(1);
+
+	do
+	{
+	}
+	while (1);
+
+
+	/* Braces on the same lines as the keywords */
+
+	do       {
+	}while(1);
+
+	do           {
+	}while(1);
+
+	do {
+	} while(1);
+
+	do        {
+	}while(1);
+
+	do {
+	} while (1);
+
+
+	/* Braces but everything on one line */
+
+	do       {}while(1);
+
+	do           {}while(1);
+
+	do {} while(1);
+
+	do        {}while(1);
+
+	do {} while (1);
+
+
+	/* No braces */
+
+	do
+		x++;
+	while(1);
+
+	do
+		x++;
+	while(1);
+
+	do
+		x++;
+	while(1);
+
+	do
+		x++;
+	while(1);
+
+	do
+		x++;
+	while (1);
+
+
+	/* No braces and everything on one line */
+
+	do x++;
+	while(1);
+
+	do x++;
+	while(1);
+
+	do x++; while(1);
+
+	do x++;
+	while(1);
+
+	do x++; while (1);
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ do
+		x++;
+	while(1);
+
+	do      // comment
+		x++;
+	while(1);
+
+	do // comment
+		x++;
+	while (1); // comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10086-infinite-loops.c
new file mode 100644
index 00000000..0bdd0220
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10086-infinite-loops.c
@@ -0,0 +1,146 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	for (;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+	for(;;)
+	{
+	}
+
+
+	/* Braces on the same lines as the keywords */
+
+	for (;;) {
+	}
+
+	for(;;)     {
+	}
+
+	for(;;) {
+	}
+
+	for(;;)  {
+	}
+
+	for(;;) {
+	}
+
+
+	/* Braces but everything on one line */
+
+	for (;;) {}
+
+	for(;;)     {}
+
+	for(;;) {}
+
+	for(;;)  {}
+
+	for(;;) {}
+
+
+	/* No braces */
+
+	for (;;) {
+		x++;
+	}
+
+	for(;;)   {
+		x++;
+	}
+
+	for(;;) {
+		x++;
+	}
+
+	for(;;) {
+		x++;
+	}
+
+	for(;;) {
+		x++;
+	}
+
+
+	/* No braces and everything on one line */
+
+	for (;;) {x++;}
+
+	for(;;)   {x++;}
+
+	for(;;) {x++;}
+
+	for(;;) {x++;}
+
+	for(;;) {x++;}
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;) {
+		x++;
+	}
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ for(;;) {
+		x++;
+	}
+
+	for(;;) { // comment
+		x++;
+	}
+
+	for(;;) { // comment
+		x++;
+	}
+	// comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;) {
+		x++;
+	}
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;) {
+		x++;
+	}
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10087-infinite-loops.c
new file mode 100644
index 00000000..bd10fa6c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10087-infinite-loops.c
@@ -0,0 +1,146 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	while(true)
+	{
+	}
+
+	while (true)
+	{
+	}
+
+	while(true)
+	{
+	}
+
+	while(true)
+	{
+	}
+
+	while(true)
+	{
+	}
+
+
+	/* Braces on the same lines as the keywords */
+
+	while(true) {
+	}
+
+	while (true) {
+	}
+
+	while(true) {
+	}
+
+	while(true) {
+	}
+
+	while(true) {
+	}
+
+
+	/* Braces but everything on one line */
+
+	while(true) {}
+
+	while (true) {}
+
+	while(true) {}
+
+	while(true) {}
+
+	while(true) {}
+
+
+	/* No braces */
+
+	while(true) {
+		x++;
+	}
+
+	while (true) {
+		x++;
+	}
+
+	while(true) {
+		x++;
+	}
+
+	while(true) {
+		x++;
+	}
+
+	while(true) {
+		x++;
+	}
+
+
+	/* No braces and everything on one line */
+
+	while(true) {x++;}
+
+	while (true) {x++;}
+
+	while(true) {x++;}
+
+	while(true) {x++;}
+
+	while(true) {x++;}
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1) {
+		x++;
+	}
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ while(true) {
+		x++;
+	}
+
+	while(true) { // comment
+		x++;
+	}
+
+	while(true) { // comment
+		x++;
+	}
+	// comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999) {
+		x++;
+	}
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1) {
+		x++;
+	}
+
+	do
+		x++;
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10088-infinite-loops.c
new file mode 100644
index 00000000..082730b7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10088-infinite-loops.c
@@ -0,0 +1,150 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	do
+	{
+	}while(true);
+
+	do
+	{
+	}while(true);
+
+	do
+	{
+	}
+	while (true);
+
+	do
+	{
+	}while(true);
+
+	do
+	{
+	}
+	while(true);
+
+
+	/* Braces on the same lines as the keywords */
+
+	do       {
+	}while(true);
+
+	do           {
+	}while(true);
+
+	do {
+	} while (true);
+
+	do        {
+	}while(true);
+
+	do {
+	} while(true);
+
+
+	/* Braces but everything on one line */
+
+	do       {}while(true);
+
+	do           {}while(true);
+
+	do {} while (true);
+
+	do        {}while(true);
+
+	do {} while(true);
+
+
+	/* No braces */
+
+	do     {
+		x++;
+	}while(true);
+
+	do         {
+		x++;
+	}while(true);
+
+	do{
+		x++;
+	}
+	while (true);
+
+	do      {
+		x++;
+	}while(true);
+
+	do{
+		x++;
+	}
+	while(true);
+
+
+	/* No braces and everything on one line */
+
+	do     {x++;}while(true);
+
+	do         {x++;}while(true);
+
+	do{x++;}while (true);
+
+	do      {x++;}while(true);
+
+	do{x++;}while(true);
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do{
+		x++;
+	}
+	while (1) /* without end */;
+
+	/* comment */ do    {
+		x++;
+	}while(true);
+
+	do    { // comment
+		x++;
+	}while(true);
+
+	do{ // comment
+		x++;
+	}
+	while(true); // comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do{
+		x++;
+	}
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do{
+		x++;
+	}
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10089-infinite-loops.c
new file mode 100644
index 00000000..8d02250f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10089-infinite-loops.c
@@ -0,0 +1,146 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	while(1)
+	{
+	}
+
+	while(1)
+	{
+	}
+
+	while(1)
+	{
+	}
+
+	while (1)
+	{
+	}
+
+	while(1)
+	{
+	}
+
+
+	/* Braces on the same lines as the keywords */
+
+	while(1) {
+	}
+
+	while(1)   {
+	}
+
+	while(1) {
+	}
+
+	while (1) {
+	}
+
+	while(1) {
+	}
+
+
+	/* Braces but everything on one line */
+
+	while(1) {}
+
+	while(1)   {}
+
+	while(1) {}
+
+	while (1) {}
+
+	while(1) {}
+
+
+	/* No braces */
+
+	while(1) {
+		x++;
+	}
+
+	while(1) {
+		x++;
+	}
+
+	while(1) {
+		x++;
+	}
+
+	while (1) {
+		x++;
+	}
+
+	while(1) {
+		x++;
+	}
+
+
+	/* No braces and everything on one line */
+
+	while(1) {x++;}
+
+	while(1) {x++;}
+
+	while(1) {x++;}
+
+	while (1) {x++;}
+
+	while(1) {x++;}
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1) {
+		x++;
+	}
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ while(1) {
+		x++;
+	}
+
+	while(1) { // comment
+		x++;
+	}
+
+	while(1) { // comment
+		x++;
+	}
+	// comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999) {
+		x++;
+	}
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1) {
+		x++;
+	}
+
+	do
+		x++;
+	while (1 == 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.76.0/tests/expected/c/10090-infinite-loops.c
new file mode 100644
index 00000000..301435cb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10090-infinite-loops.c
@@ -0,0 +1,150 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	do
+	{
+	}while(1);
+
+	do
+	{
+	}while(1);
+
+	do
+	{
+	}
+	while(1);
+
+	do
+	{
+	}while(1);
+
+	do
+	{
+	}
+	while (1);
+
+
+	/* Braces on the same lines as the keywords */
+
+	do       {
+	}while(1);
+
+	do           {
+	}while(1);
+
+	do {
+	} while(1);
+
+	do        {
+	}while(1);
+
+	do {
+	} while (1);
+
+
+	/* Braces but everything on one line */
+
+	do       {}while(1);
+
+	do           {}while(1);
+
+	do {} while(1);
+
+	do        {}while(1);
+
+	do {} while (1);
+
+
+	/* No braces */
+
+	do     {
+		x++;
+	}while(1);
+
+	do         {
+		x++;
+	}while(1);
+
+	do{
+		x++;
+	}
+	while(1);
+
+	do      {
+		x++;
+	}while(1);
+
+	do{
+		x++;
+	}
+	while (1);
+
+
+	/* No braces and everything on one line */
+
+	do     {x++;}while(1);
+
+	do         {x++;}while(1);
+
+	do{x++;}while(1);
+
+	do      {x++;}while(1);
+
+	do{x++;}while (1);
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do{
+		x++;
+	}
+	while (1) /* without end */;
+
+	/* comment */ do    {
+		x++;
+	}while(1);
+
+	do    { // comment
+		x++;
+	}while(1);
+
+	do{ // comment
+		x++;
+	}
+	while (1); // comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do{
+		x++;
+	}
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do{
+		x++;
+	}
+	while (1 == 1);
+}
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.76.0/tests/expected/c/10091-int-types.c
new file mode 100644
index 00000000..ef816676
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10091-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short int short_var;
+short int short_int_var;
+short int int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short int /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10092-int-types.c
new file mode 100644
index 00000000..c8342e53
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10092-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10093-int-types.c
new file mode 100644
index 00000000..1095528c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10093-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long int long_var;
+long int long_int_var;
+long int int_long_var;
+
+long long int long_long_var;
+long long int long_long_int_var;
+long long int int_long_long_var;
+long long int long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long int const_long_var;
+long int const long_const_var;
+
+unsigned long int unsigned_long_var;
+long int unsigned long_unsigned_var;
+
+unsigned const long int unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const long int const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+const long int int_const_long_var;
+long int const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned long int unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+unsigned long int int_unsigned_long_var;
+long int unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10094-int-types.c
new file mode 100644
index 00000000..4ea57931
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10094-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long long_long_int_var;
+int long long int_long_long_var;
+long long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long unsigned_const_long_int_var;
+
+const long const_long_int_var;
+const int long const_int_long_var;
+long const long_const_int_var;
+long const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10095-int-types.c
new file mode 100644
index 00000000..d856e20d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10095-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed int signed_var;
+signed int signed_int_var;
+signed int int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10096-int-types.c
new file mode 100644
index 00000000..d25a1589
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10096-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10097-int-types.c
new file mode 100644
index 00000000..cbf7c128
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10097-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned int unsigned_var;
+unsigned int unsigned_int_var;
+unsigned int int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned int long unsigned_long_var;
+long unsigned int long_unsigned_var;
+
+unsigned int const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long unsigned int long_int_unsigned_var;
+unsigned int long int_unsigned_long_var;
+long unsigned int unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10098-int-types.c
new file mode 100644
index 00000000..3553f9bc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10098-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned long unsigned_int_long_var;
+long unsigned long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10099-int-types.c
new file mode 100644
index 00000000..d6d07b82
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10099-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+int short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+int short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10100-int-types.c
new file mode 100644
index 00000000..fd4d4fe6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10100-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10101-int-types.c
new file mode 100644
index 00000000..a81cbc62
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10101-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+int long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long int long long_long_var;
+long long int long_long_int_var;
+long int long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const int long const_long_var;
+int long const long_const_var;
+
+unsigned int long unsigned_long_var;
+int long unsigned long_unsigned_var;
+
+unsigned const int long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+unsigned int long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10102-int-types.c
new file mode 100644
index 00000000..9edf7fcc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10102-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+long long int_long_long_var;
+long long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+const long int_const_long_var;
+long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10103-int-types.c
new file mode 100644
index 00000000..15cf2dd5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10103-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+int signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10104-int-types.c
new file mode 100644
index 00000000..9b3c8720
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10104-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10105-int-types.c
new file mode 100644
index 00000000..57924029
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10105-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+int unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+int unsigned long unsigned_long_var;
+long int unsigned long_unsigned_var;
+
+int unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+long int unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10106-int-types.c
new file mode 100644
index 00000000..fbe47a9a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10106-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long unsigned long_int_unsigned_var;
+unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10107-int-types.c
new file mode 100644
index 00000000..142159aa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10107-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+int short short_var;
+int short short_int_var;
+int short int_short_var;
+
+int long long_var;
+int long long_int_var;
+int long int_long_var;
+
+int long long long_long_var;
+int long long long_long_int_var;
+int long long int_long_long_var;
+int long long long_int_long_var;
+
+int signed signed_var;
+int signed signed_int_var;
+int signed int_signed_var;
+
+int unsigned unsigned_var;
+int unsigned unsigned_int_var;
+int unsigned int_unsigned_var;
+
+int short /* comment */ short_comment_var;
+int short /* comment */ short_comment_int_var;
+
+const int long const_long_var;
+int long const long_const_var;
+
+int unsigned long unsigned_long_var;
+int long unsigned long_unsigned_var;
+
+int unsigned const long unsigned_const_long_var;
+int unsigned const long unsigned_const_long_int_var;
+
+const int long const_long_int_var;
+const int long const_int_long_var;
+int long const long_const_int_var;
+int long const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+int unsigned long unsigned_long_int_var;
+int unsigned long unsigned_int_long_var;
+int long unsigned long_unsigned_int_var;
+int long unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10108-int-types.c
new file mode 100644
index 00000000..9e69f009
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10108-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short int short_var;
+short int short_int_var;
+short int int_short_var;
+
+long int long_var;
+long int long_int_var;
+long int int_long_var;
+
+long long int long_long_var;
+long long int long_long_int_var;
+long long int int_long_long_var;
+long long int long_int_long_var;
+
+signed int signed_var;
+signed int signed_int_var;
+signed int int_signed_var;
+
+unsigned int unsigned_var;
+unsigned int unsigned_int_var;
+unsigned int int_unsigned_var;
+
+short int /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long int const_long_var;
+long int const long_const_var;
+
+unsigned long int unsigned_long_var;
+long unsigned int long_unsigned_var;
+
+unsigned const long int unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const long int const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+const long int int_const_long_var;
+long int const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned long int unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long unsigned int long_int_unsigned_var;
+unsigned long int int_unsigned_long_var;
+long unsigned int unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10109-int-types.c
new file mode 100644
index 00000000..142159aa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10109-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+int short short_var;
+int short short_int_var;
+int short int_short_var;
+
+int long long_var;
+int long long_int_var;
+int long int_long_var;
+
+int long long long_long_var;
+int long long long_long_int_var;
+int long long int_long_long_var;
+int long long long_int_long_var;
+
+int signed signed_var;
+int signed signed_int_var;
+int signed int_signed_var;
+
+int unsigned unsigned_var;
+int unsigned unsigned_int_var;
+int unsigned int_unsigned_var;
+
+int short /* comment */ short_comment_var;
+int short /* comment */ short_comment_int_var;
+
+const int long const_long_var;
+int long const long_const_var;
+
+int unsigned long unsigned_long_var;
+int long unsigned long_unsigned_var;
+
+int unsigned const long unsigned_const_long_var;
+int unsigned const long unsigned_const_long_int_var;
+
+const int long const_long_int_var;
+const int long const_int_long_var;
+int long const long_const_int_var;
+int long const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+int unsigned long unsigned_long_int_var;
+int unsigned long unsigned_int_long_var;
+int long unsigned long_unsigned_int_var;
+int long unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10110-int-types.c
new file mode 100644
index 00000000..9e69f009
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10110-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short int short_var;
+short int short_int_var;
+short int int_short_var;
+
+long int long_var;
+long int long_int_var;
+long int int_long_var;
+
+long long int long_long_var;
+long long int long_long_int_var;
+long long int int_long_long_var;
+long long int long_int_long_var;
+
+signed int signed_var;
+signed int signed_int_var;
+signed int int_signed_var;
+
+unsigned int unsigned_var;
+unsigned int unsigned_int_var;
+unsigned int int_unsigned_var;
+
+short int /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long int const_long_var;
+long int const long_const_var;
+
+unsigned long int unsigned_long_var;
+long unsigned int long_unsigned_var;
+
+unsigned const long int unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const long int const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+const long int int_const_long_var;
+long int const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned long int unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long unsigned int long_int_unsigned_var;
+unsigned long int int_unsigned_long_var;
+long unsigned int unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10111-int-types.c
new file mode 100644
index 00000000..c7b58ba0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10111-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+short int_short_var;
+
+long long_var;
+long int long_int_var;
+long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+long long int_long_long_var;
+long long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+const long int_const_long_var;
+long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long unsigned long_int_unsigned_var;
+unsigned long int_unsigned_long_var;
+long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10112-int-types.c
new file mode 100644
index 00000000..ac42591f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10112-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short short_int_var;
+int short int_short_var;
+
+long long_var;
+long long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long long_long_int_var;
+int long long int_long_long_var;
+long long long_int_long_var;
+
+signed signed_var;
+signed signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long unsigned_const_long_int_var;
+
+const long const_long_int_var;
+const int long const_int_long_var;
+long const long_const_int_var;
+long const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long unsigned_long_int_var;
+unsigned long unsigned_int_long_var;
+long unsigned long_unsigned_int_var;
+long unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
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.76.0/tests/expected/c/10113-int-types.c
new file mode 100644
index 00000000..f4085895
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10113-int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short short_int_var;
+short int_short_var;
+
+long long_var;
+long long_int_var;
+long int_long_var;
+
+long long long_long_var;
+long long long_long_int_var;
+long long int_long_long_var;
+long long long_int_long_var;
+
+signed signed_var;
+signed signed_int_var;
+signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned unsigned_int_var;
+unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long unsigned_const_long_int_var;
+
+const long const_long_int_var;
+const long const_int_long_var;
+long const long_const_int_var;
+long const long_int_const_var;
+const long int_const_long_var;
+long const int_long_const_var;
+
+unsigned long unsigned_long_int_var;
+unsigned long unsigned_int_long_var;
+long unsigned long_unsigned_int_var;
+long unsigned long_int_unsigned_var;
+unsigned long int_unsigned_long_var;
+long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02102-indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02102-indent-c.cpp
index 6828d1c5..978dfae4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02102-indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02102-indent-c.cpp
@@ -120,8 +120,8 @@ static void indent_comment(Chunk *pc, int col);
 
 void indent_to_column(Chunk *pc, int column)
   {
-  if (column < pc->column)
-    column = pc->column;
+  if (column < pc->GetColumn())
+    column = pc->GetColumn();
 
   reindent_line(pc, column);
   }
@@ -138,15 +138,15 @@ void reindent_line(Chunk *pc, int column)
   int min_col;
 
   LOG_FMT(LINDLINE, "%s: %d] col %d on %.*s [%s] => %d\n",
-          __func__, pc->orig_line, pc->column, pc->len, pc->str,
-          get_token_name(pc->type), column);
+          __func__, pc->GetOrigLine(), pc->GetColumn(), pc->len, pc->GetStr(),
+          get_token_name(pc->GetType()), column);
 
-  if (column == pc->column)
+  if (column == pc->GetColumn())
     return;
 
-  col_delta  = column - pc->column;
-  pc->column = column;
-  min_col    = pc->column;
+  col_delta  = column - pc->GetColumn();
+  pc->SetColumn(column);
+  min_col    = pc->GetColumn();
 
   do
     {
@@ -155,26 +155,26 @@ void reindent_line(Chunk *pc, int column)
 
     if (pc != NULL)
       {
-      if (chunk_is_comment(pc))
+      if (pc->IsComment())
         {
-        pc->column = pc->orig_col;
+        pc->SetColumn(pc->GetOrigCol());
 
-        if (pc->column < min_col)
-          pc->column = min_col + 1;
+        if (pc->GetColumn() < min_col)
+          pc->SetColumn(min_col + 1);
 
         LOG_FMT(LINDLINE, "%s: set comment on line %d to col %d (orig %d)\n",
-                __func__, pc->orig_line, pc->column, pc->orig_col);
+                __func__, pc->GetOrigLine(), pc->GetColumn(), pc->GetOrigCol());
         }
       else
         {
-        pc->column += col_delta;
+        pc->SetColumn(pc->GetColumn() + col_delta);
 
-        if (pc->column < min_col)
-          pc->column = min_col;
+        if (pc->GetColumn() < min_col)
+          pc->SetColumn(min_col);
         }
       }
     }
-  while ((pc != NULL) && (pc->nl_count == 0));
+  while ((pc != NULL) && (pc->GetNlCount() == 0));
   }
 
 /**
@@ -195,13 +195,13 @@ static void indent_pse_push(struct parse_frame& frm, Chunk *pc)
     memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos]));
 
     LOG_FMT(LINDPSE, "%4d] OPEN  [%d,%s] level=%d\n",
-            pc->orig_line, frm.pse_tos, get_token_name(pc->type), pc->level);
+            pc->GetOrigLine(), frm.pse_tos, get_token_name(pc->GetType()), pc->GetLevel());
 
-    frm.pse[frm.pse_tos].type       = pc->type;
-    frm.pse[frm.pse_tos].level      = pc->level;
-    frm.pse[frm.pse_tos].open_line  = pc->orig_line;
+    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->flags & PCF_IN_PREPROC) != 0;
+    frm.pse[frm.pse_tos].in_preproc = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
     }
   }
 
@@ -219,12 +219,12 @@ static void indent_pse_pop(struct parse_frame& frm, Chunk *pc)
     if (pc != NULL)
       {
       LOG_FMT(LINDPSE, "%4d] CLOSE [%d,%s] on %s, started on line %d, level=%d/%d\n",
-              pc->orig_line, frm.pse_tos,
+              pc->GetOrigLine(), frm.pse_tos,
               get_token_name(frm.pse[frm.pse_tos].type),
-              get_token_name(pc->type),
+              get_token_name(pc->GetType()),
               frm.pse[frm.pse_tos].open_line,
               frm.pse[frm.pse_tos].level,
-              pc->level);
+              pc->GetLevel());
       }
     else
       {
@@ -298,10 +298,10 @@ void indent_text(void)
     {
       /* Handle proprocessor transitions */
     was_preproc = in_preproc;
-    in_preproc  = (pc->flags & PCF_IN_PREPROC) != 0;
+    in_preproc  = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
 
     if (cpd.settings[UO_indent_brace_parent].b)
-      parent_token_indent = token_indent(pc->parent_type);
+      parent_token_indent = token_indent(pc->GetParentType());
 
       /* Clean up after a #define */
     if (!in_preproc)
@@ -324,8 +324,8 @@ void indent_text(void)
       }
 
     if ((cout_col > 0) &&
-        (chunk_is_semicolon(pc) ||
-         (pc->level < cout_level)))
+        (pc->IsSemicolon() ||
+         (pc->GetLevel() < cout_level)))
       {
       cout_col   = 0;
       cout_level = 0;
@@ -344,16 +344,16 @@ void indent_text(void)
       /* End anything that drops a level
        * REVISIT: not sure about the preproc check
        */
-      if (!chunk_is_newline(pc) &&
-          !chunk_is_comment(pc) &&
-          ((pc->flags & PCF_IN_PREPROC) == 0) &&
-          (frm.pse[frm.pse_tos].level > pc->level))
+      if (!pc->IsNewline() &&
+          !pc->IsComment() &&
+          ((pc->GetFlags() & PCF_IN_PREPROC) == 0) &&
+          (frm.pse[frm.pse_tos].level > pc->GetLevel()))
         indent_pse_pop(frm, pc);
 
-      if (frm.pse[frm.pse_tos].level == pc->level)
+      if (frm.pse[frm.pse_tos].level == pc->GetLevel())
         {
           /* process virtual braces closes (no text output) */
-        if ((pc->type == CT_VBRACE_CLOSE) &&
+        if ((pc->GetType() == CT_VBRACE_CLOSE) &&
             (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN))
           {
           indent_pse_pop(frm, pc);
@@ -363,35 +363,35 @@ void indent_text(void)
 
           /* End any assign operations with a semicolon on the same level */
         if ((frm.pse[frm.pse_tos].type == CT_ASSIGN) &&
-            (chunk_is_semicolon(pc) ||
-             (pc->type == CT_COMMA) ||
-             (pc->type == CT_BRACE_OPEN)))
+            (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) &&
-            ((pc->type == CT_BRACE_OPEN) ||
-             chunk_is_semicolon(pc)))
+            ((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) &&
-            ((pc->type == CT_BRACE_CLOSE) ||
-             (pc->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) &&
-            chunk_is_semicolon(pc))
+            pc->IsSemicolon())
           indent_pse_pop(frm, pc);
 
           /* Close out parens and squares */
-        if ((frm.pse[frm.pse_tos].type == (pc->type - 1)) &&
-            ((pc->type == CT_PAREN_CLOSE) ||
-             (pc->type == CT_SPAREN_CLOSE) ||
-             (pc->type == CT_FPAREN_CLOSE) ||
-             (pc->type == CT_SQUARE_CLOSE) ||
-             (pc->type == CT_ANGLE_CLOSE)))
+        if ((frm.pse[frm.pse_tos].type == (pc->GetType() - 1)) &&
+            ((pc->GetType() == CT_PAREN_CLOSE) ||
+             (pc->GetType() == CT_SPAREN_CLOSE) ||
+             (pc->GetType() == CT_FPAREN_CLOSE) ||
+             (pc->GetType() == CT_SQUARE_CLOSE) ||
+             (pc->GetType() == CT_ANGLE_CLOSE)))
           {
           indent_pse_pop(frm, pc);
           frm.paren_count--;
@@ -403,10 +403,10 @@ void indent_text(void)
       /* Grab a copy of the current indent */
     indent_column = frm.pse[frm.pse_tos].indent_tmp;
 
-    if (!chunk_is_newline(pc) && !chunk_is_comment(pc))
+    if (!pc->IsNewline() && !pc->IsComment())
       {
       LOG_FMT(LINDPC, " -=[ %.*s ]=- top=%d %s %d/%d\n",
-              pc->len, pc->str,
+              pc->len, pc->GetStr(),
               frm.pse_tos,
               get_token_name(frm.pse[frm.pse_tos].type),
               frm.pse[frm.pse_tos].indent_tmp,
@@ -429,7 +429,7 @@ void indent_text(void)
      *  - return
      */
 
-    if (pc->type == CT_BRACE_CLOSE)
+    if (pc->GetType() == CT_BRACE_CLOSE)
       {
       if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN)
         {
@@ -441,17 +441,17 @@ void indent_text(void)
             (parent_token_indent == 0))
           indent_column = frm.pse[frm.pse_tos].indent_tmp;
 
-        if ((pc->parent_type == CT_IF) ||
-            (pc->parent_type == CT_ELSE) ||
-            (pc->parent_type == CT_ELSEIF) ||
-            (pc->parent_type == CT_DO) ||
-            (pc->parent_type == CT_WHILE) ||
-            (pc->parent_type == CT_SWITCH) ||
-            (pc->parent_type == CT_FOR))
+        if ((pc->GetParentType() == CT_IF) ||
+            (pc->GetParentType() == CT_ELSE) ||
+            (pc->GetParentType() == CT_ELSEIF) ||
+            (pc->GetParentType() == CT_DO) ||
+            (pc->GetParentType() == CT_WHILE) ||
+            (pc->GetParentType() == CT_SWITCH) ||
+            (pc->GetParentType() == CT_FOR))
           indent_column += cpd.settings[UO_indent_brace].n;
         }
       }
-    else if (pc->type == CT_VBRACE_OPEN)
+    else if (pc->GetType() == CT_VBRACE_OPEN)
       {
       frm.level++;
       indent_pse_push(frm, pc);
@@ -462,7 +462,7 @@ void indent_text(void)
         /* Always indent on virtual braces */
       indent_column = frm.pse[frm.pse_tos].indent_tmp;
       }
-    else if (pc->type == CT_BRACE_OPEN)
+    else if (pc->GetType() == CT_BRACE_OPEN)
       {
       frm.level++;
       indent_pse_push(frm, pc);
@@ -476,13 +476,13 @@ void indent_text(void)
         frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
 
           /* If this brace is part of a statement, bump it out by indent_brace */
-        if ((pc->parent_type == CT_IF) ||
-            (pc->parent_type == CT_ELSE) ||
-            (pc->parent_type == CT_ELSEIF) ||
-            (pc->parent_type == CT_DO) ||
-            (pc->parent_type == CT_WHILE) ||
-            (pc->parent_type == CT_SWITCH) ||
-            (pc->parent_type == CT_FOR))
+        if ((pc->GetParentType() == CT_IF) ||
+            (pc->GetParentType() == CT_ELSE) ||
+            (pc->GetParentType() == CT_ELSEIF) ||
+            (pc->GetParentType() == CT_DO) ||
+            (pc->GetParentType() == CT_WHILE) ||
+            (pc->GetParentType() == CT_SWITCH) ||
+            (pc->GetParentType() == CT_FOR))
           {
           if (parent_token_indent != 0)
             frm.pse[frm.pse_tos].indent += parent_token_indent - indent_size;
@@ -492,22 +492,22 @@ void indent_text(void)
             indent_column += cpd.settings[UO_indent_brace].n;
             }
           }
-        else if (pc->parent_type == CT_CASE)
+        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;
           }
-        else if ((pc->parent_type == CT_CLASS) && !cpd.settings[UO_indent_class].b)
+        else if ((pc->GetParentType() == CT_CLASS) && !cpd.settings[UO_indent_class].b)
           frm.pse[frm.pse_tos].indent -= indent_size;
-        else if ((pc->parent_type == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
+        else if ((pc->GetParentType() == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
           frm.pse[frm.pse_tos].indent -= indent_size;
         }
 
-      if ((pc->flags & PCF_DONT_INDENT) != 0)
+      if ((pc->GetFlags() & PCF_DONT_INDENT) != 0)
         {
-        frm.pse[frm.pse_tos].indent = pc->column;
-        indent_column = pc->column;
+        frm.pse[frm.pse_tos].indent = pc->GetColumn();
+        indent_column = pc->GetColumn();
         }
       else
         {
@@ -520,11 +520,11 @@ void indent_text(void)
          */
         next = pc->GetNextNcNnl();
 
-        if (!chunk_is_newline_between(pc, next))
-          frm.pse[frm.pse_tos].indent = next->column;
+        if (!pc->IsNewlineBetween(next))
+          frm.pse[frm.pse_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->orig_line;
+        frm.pse[frm.pse_tos].open_line  = pc->GetOrigLine();
 
           /* Update the indent_column if needed */
         if (cpd.settings[UO_indent_braces].n ||
@@ -532,7 +532,7 @@ void indent_text(void)
           indent_column = frm.pse[frm.pse_tos].indent_tmp;
         }
       }
-    else if (pc->type == CT_CASE)
+    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;
@@ -545,7 +545,7 @@ void indent_text(void)
         /* Always set on case statements */
       indent_column = frm.pse[frm.pse_tos].indent_tmp;
       }
-    else if (pc->type == CT_LABEL)
+    else if (pc->GetType() == CT_LABEL)
       {
         /* Labels get sent to the left or backed up */
       if (cpd.settings[UO_indent_label].n > 0)
@@ -554,7 +554,7 @@ void indent_text(void)
         indent_column = frm.pse[frm.pse_tos].indent +
                         cpd.settings[UO_indent_label].n;
       }
-    else if (pc->type == CT_CLASS_COLON)
+    else if (pc->GetType() == CT_CLASS_COLON)
       {
         /* just indent one level */
       indent_pse_push(frm, pc);
@@ -567,26 +567,26 @@ void indent_text(void)
         {
         prev = pc->GetPrev();
 
-        if (chunk_is_newline(prev))
+        if (prev->IsNewline())
           {
           frm.pse[frm.pse_tos].indent += 2;
           /* don't change indent of current line */
           }
         }
       }
-    else if ((pc->type == CT_PAREN_OPEN) ||
-             (pc->type == CT_SPAREN_OPEN) ||
-             (pc->type == CT_FPAREN_OPEN) ||
-             (pc->type == CT_SQUARE_OPEN) ||
-             (pc->type == CT_ANGLE_OPEN))
+    else if ((pc->GetType() == CT_PAREN_OPEN) ||
+             (pc->GetType() == CT_SPAREN_OPEN) ||
+             (pc->GetType() == CT_FPAREN_OPEN) ||
+             (pc->GetType() == CT_SQUARE_OPEN) ||
+             (pc->GetType() == CT_ANGLE_OPEN))
       {
         /* Open parens and squares - never update indent_column */
       indent_pse_push(frm, pc);
-      frm.pse[frm.pse_tos].indent = pc->column + pc->len;
+      frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len;
 
       if (cpd.settings[UO_indent_func_call_param].b &&
-          (pc->type == CT_FPAREN_OPEN) &&
-          (pc->parent_type == CT_FUNC_CALL))
+          (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;
 
       if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) ||
@@ -594,7 +594,7 @@ void indent_text(void)
         {
         next = pc->GetNextNc();
 
-        if (chunk_is_newline(next))
+        if (next->IsNewline())
           {
           int sub = 1;
 
@@ -608,7 +608,7 @@ void indent_text(void)
       frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
       frm.paren_count++;
       }
-    else if (pc->type == CT_ASSIGN)
+    else if (pc->GetType() == CT_ASSIGN)
       {
       /**
        * if there is a newline after the '=', just indent one level,
@@ -621,18 +621,18 @@ void indent_text(void)
         {
         indent_pse_push(frm, pc);
 
-        if (chunk_is_newline(next))
+        if (next->IsNewline())
           frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
         else
-          frm.pse[frm.pse_tos].indent = pc->column + pc->len + 1;
+          frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len + 1;
 
         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
         }
       }
-    else if (pc->type == CT_RETURN)
+    else if (pc->GetType() == CT_RETURN)
       {
         /* don't count returns inside a () or [] */
-      if (pc->level == pc->brace_level)
+      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;
@@ -643,8 +643,8 @@ void indent_text(void)
       {
       if (cout_col == 0)
         {
-        cout_col   = pc->column;
-        cout_level = pc->level;
+        cout_col   = pc->GetColumn();
+        cout_level = pc->GetLevel();
         }
       }
     else
@@ -655,7 +655,7 @@ void indent_text(void)
     /**
      * Indent the line if needed
      */
-    if (did_newline && !chunk_is_newline(pc) && (pc->len != 0))
+    if (did_newline && !pc->IsNewline() && (pc->len != 0))
       {
       /**
        * Check for special continuations.
@@ -665,57 +665,57 @@ void indent_text(void)
 
       prev = pc->GetPrevNcNnl();
 
-      if ((pc->type == CT_MEMBER) ||
-          (pc->type == CT_DC_MEMBER) ||
+      if ((pc->GetType() == CT_MEMBER) ||
+          (pc->GetType() == CT_DC_MEMBER) ||
           ((prev != NULL) &&
-           ((prev->type == CT_MEMBER) ||
-            (prev->type == CT_DC_MEMBER))))
+           ((prev->GetType() == CT_MEMBER) ||
+            (prev->GetType() == CT_DC_MEMBER))))
         {
         tmp = cpd.settings[UO_indent_member].n + indent_column;
         LOG_FMT(LINDENT, "%s: %d] member => %d\n",
-                __func__, pc->orig_line, tmp);
+                __func__, pc->GetOrigLine(), tmp);
         reindent_line(pc, tmp);
         }
       else if (chunk_is_str(pc, "<<", 2) && (cout_col > 0))
         {
         LOG_FMT(LINDENT, "%s: %d] cout_col => %d\n",
-                __func__, pc->orig_line, cout_col);
+                __func__, pc->GetOrigLine(), cout_col);
         reindent_line(pc, cout_col);
         }
       else if ((vardefcol > 0) &&
-               (pc->type == CT_WORD) &&
-               ((pc->flags & PCF_VAR_DEF) != 0) &&
-               (prev != NULL) && (prev->type == CT_COMMA))
+               (pc->GetType() == CT_WORD) &&
+               ((pc->GetFlags() & PCF_VAR_DEF) != 0) &&
+               (prev != NULL) && (prev->GetType() == CT_COMMA))
         {
         LOG_FMT(LINDENT, "%s: %d] Vardefcol => %d\n",
-                __func__, pc->orig_line, vardefcol);
+                __func__, pc->GetOrigLine(), vardefcol);
         reindent_line(pc, vardefcol);
         }
-      else if ((pc->type == CT_STRING) && (prev->type == CT_STRING) &&
+      else if ((pc->GetType() == CT_STRING) && (prev->GetType() == CT_STRING) &&
                cpd.settings[UO_indent_align_string].b)
         {
         LOG_FMT(LINDENT, "%s: %d] String => %d\n",
-                __func__, pc->orig_line, prev->column);
-        reindent_line(pc, prev->column);
+                __func__, pc->GetOrigLine(), prev->GetColumn());
+        reindent_line(pc, prev->GetColumn());
         }
-      else if (chunk_is_comment(pc))
+      else if (pc->IsComment())
         {
         LOG_FMT(LINDENT, "%s: %d] comment => %d\n",
-                __func__, pc->orig_line, frm.pse[frm.pse_tos].indent_tmp);
+                __func__, pc->GetOrigLine(), frm.pse[frm.pse_tos].indent_tmp);
         indent_comment(pc, frm.pse[frm.pse_tos].indent_tmp);
         }
-      else if (pc->type == CT_PREPROC)
+      else if (pc->GetType() == CT_PREPROC)
         {
           /* Preprocs are always in column 1. See indent_preproc() */
-        if (pc->column != 1)
+        if (pc->GetColumn() != 1)
           reindent_line(pc, 1);
         }
       else
         {
-        if (pc->column != indent_column)
+        if (pc->GetColumn() != indent_column)
           {
           LOG_FMT(LINDENT, "%s: %d] indent => %d [%.*s]\n",
-                  __func__, pc->orig_line, indent_column, pc->len, pc->str);
+                  __func__, pc->GetOrigLine(), indent_column, pc->len, pc->GetStr());
           reindent_line(pc, indent_column);
           }
         }
@@ -726,19 +726,19 @@ void indent_text(void)
     /**
      * Handle variable definition continuation indenting
      */
-    if ((pc->type == CT_WORD) &&
-        ((pc->flags & PCF_IN_FCN_DEF) == 0) &&
-        ((pc->flags & PCF_VAR_1ST_DEF) == PCF_VAR_1ST_DEF))
-      vardefcol = pc->column;
+    if ((pc->GetType() == CT_WORD) &&
+        ((pc->GetFlags() & PCF_IN_FCN_DEF) == 0) &&
+        ((pc->GetFlags() & PCF_VAR_1ST_DEF) == PCF_VAR_1ST_DEF))
+      vardefcol = pc->GetColumn();
 
-    if (chunk_is_semicolon(pc) ||
-        ((pc->type == CT_BRACE_OPEN) && (pc->parent_type == CT_FUNCTION)))
+    if (pc->IsSemicolon() ||
+        ((pc->GetType() == CT_BRACE_OPEN) && (pc->GetParentType() == CT_FUNCTION)))
       vardefcol = 0;
 
       /* if we hit a newline, reset indent_tmp */
-    if (chunk_is_newline(pc) ||
-        (pc->type == CT_COMMENT_MULTI) ||
-        (pc->type == CT_COMMENT_CPP))
+    if (pc->IsNewline() ||
+        (pc->GetType() == CT_COMMENT_MULTI) ||
+        (pc->GetType() == CT_COMMENT_CPP))
       {
       frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
 
@@ -746,7 +746,7 @@ void indent_text(void)
        * Handle the case of a multi-line #define w/o anything on the
        * first line (indent_tmp will be 1 or 0)
        */
-      if ((pc->type == CT_NL_CONT) &&
+      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;
 
@@ -754,7 +754,7 @@ void indent_text(void)
       did_newline = true;
       }
 
-    if (!chunk_is_comment(pc) && !chunk_is_newline(pc))
+    if (!pc->IsComment() && !pc->IsNewline())
       prev = pc;
 
     pc = pc->GetNext();
@@ -785,15 +785,15 @@ static bool single_line_comment_indent_rule_applies(Chunk *start)
   Chunk *pc      = start;
   int nl_count = 0;
 
-  if (!chunk_is_single_line_comment(pc))
+  if (!pc->IsSingleLineComment())
     return false;
 
     /* scan forward, if only single newlines and comments before next line of code, we want to apply */
   while ((pc = pc->GetNext()) != NULL)
     {
-    if (chunk_is_newline(pc))
+    if (pc->IsNewline())
       {
-      if (nl_count > 0 || pc->nl_count > 1)
+      if (nl_count > 0 || pc->GetNlCount() > 1)
         return false;
 
       nl_count++;
@@ -802,11 +802,11 @@ static bool single_line_comment_indent_rule_applies(Chunk *start)
       {
       nl_count = 0;
 
-      if (!chunk_is_single_line_comment(pc))
+      if (!pc->IsSingleLineComment())
         {
           /* here we check for things to run into that we wouldn't want to indent the comment for */
           /* for example, non-single line comment, closing brace */
-        if (chunk_is_comment(pc) || chunk_is_closing_brace(pc))
+        if (pc->IsComment() || pc->IsBraceClose())
           return false;
 
         return true;
@@ -852,40 +852,40 @@ static void indent_comment(Chunk *pc, int col)
   Chunk *prev;
 
   LOG_FMT(LCMTIND, "%s: line %d, col %d, level %d: ", __func__,
-          pc->orig_line, pc->orig_col, pc->level);
+          pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
 
     /* force column 1 comment to column 1 if not changing them */
-  if ((pc->orig_col == 1) && !cpd.settings[UO_indent_col1_comment].b)
+  if ((pc->GetOrigCol() == 1) && !cpd.settings[UO_indent_col1_comment].b)
     {
     LOG_FMT(LCMTIND, "rule 1 - keep in col 1\n");
-    pc->column = 1;
+    pc->SetColumn(1);
     return;
     }
 
   nl = pc->GetPrev();
 
     /* outside of any expression or statement? */
-  if (pc->level == 0)
+  if (pc->GetLevel() == 0)
     {
-    if ((nl != NULL) && (nl->nl_count > 1))
+    if ((nl != NULL) && (nl->GetNlCount() > 1))
       {
       LOG_FMT(LCMTIND, "rule 2 - level 0, nl before\n");
-      pc->column = 1;
+      pc->SetColumn(1);
       return;
       }
     }
 
   prev = nl->GetPrev();
 
-  if (chunk_is_comment(prev) && (nl->nl_count == 1))
+  if (prev->IsComment() && (nl->GetNlCount() == 1))
     {
-    int coldiff = prev->orig_col - pc->orig_col;
+    int coldiff = prev->GetOrigCol() - pc->GetOrigCol();
 
     if ((coldiff <= 3) && (coldiff >= -3))
       {
-      pc->column = prev->column;
+      pc->SetColumn(prev->GetColumn());
       LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %d\n",
-              coldiff, pc->column);
+              coldiff, pc->GetColumn());
       return;
       }
     }
@@ -893,19 +893,19 @@ static void indent_comment(Chunk *pc, int col)
     /* check if special single line comment rule applies */
   if (cpd.settings[UO_indent_sing_line_comments].n > 0 && single_line_comment_indent_rule_applies(pc))
     {
-    pc->column = col + cpd.settings[UO_indent_sing_line_comments].n;
-    LOG_FMT(LCMTIND, "rule 4 - single line comment indent, now in %d\n", pc->column);
+    pc->SetColumn(col + cpd.settings[UO_indent_sing_line_comments].n);
+    LOG_FMT(LCMTIND, "rule 4 - single line comment indent, now in %d\n", pc->GetColumn());
     return;
     }
 
   LOG_FMT(LCMTIND, "rule 5 - fall-through, stay in %d\n", col);
 
-  pc->column = col;
+  pc->SetColumn(col);
   }
 
 /**
  * Put spaces on either side of the preproc (#) symbol.
- * This is done by pointing pc->str into pp_str and adjusting the
+ * This is done by pointing pc->GetStr() into pp_str and adjusting the
  * length.
  */
 void indent_preproc(void)
@@ -925,18 +925,18 @@ void indent_preproc(void)
 
   for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
     {
-    if (chunk_is_comment(pc) || chunk_is_newline(pc))
+    if (pc->IsComment() || pc->IsNewline())
       continue;
 
     if (stage == 0)
       {
         /* Check the first PP, make sure it is an #if type */
-      if (pc->type != CT_PREPROC)
+      if (pc->GetType() != CT_PREPROC)
         break;
 
       next = pc->GetNext();
 
-      if ((next == NULL) || (next->type != CT_PP_IF))
+      if ((next == NULL) || (next->GetType() != CT_PP_IF))
         break;
 
       stage = 1;
@@ -944,8 +944,8 @@ void indent_preproc(void)
     else if (stage == 1)
       {
         /* Scan until a PP at level 0 is found - the close to the #if */
-      if ((pc->type == CT_PREPROC) &&
-          (pc->pp_level == 0))
+      if ((pc->GetType() == CT_PREPROC) &&
+          (pc->GetPpLevel() == 0))
         stage = 2;
 
       continue;
@@ -953,8 +953,8 @@ void indent_preproc(void)
     else if (stage == 2)
       {
         /* We should only see the rest of the preprocessor */
-      if ((pc->type == CT_PREPROC) ||
-          ((pc->flags & PCF_IN_PREPROC) == 0))
+      if ((pc->GetType() == CT_PREPROC) ||
+          ((pc->GetFlags() & PCF_IN_PREPROC) == 0))
         {
         stage = 0;
         break;
@@ -970,25 +970,25 @@ void indent_preproc(void)
 
   for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
     {
-    if (pc->type != CT_PREPROC)
+    if (pc->GetType() != CT_PREPROC)
       continue;
 
-    if (pc->column != 1)
+    if (pc->GetColumn() != 1)
       {
         /* Don't handle preprocessors that aren't in column 1 */
       LOG_FMT(LINFO, "%s: Line %d doesn't start in column 1 (%d)\n",
-              __func__, pc->orig_line, pc->column);
+              __func__, pc->GetOrigLine(), pc->GetColumn());
       continue;
       }
 
       /* point into pp_str */
     if (pc->len == 2)
         /* alternate token crap */
-      pc->str = &alt_str[16];
+      pc->Str() = &alt_str[16];
     else
-      pc->str = &pp_str[16];
+      pc->Str() = &pp_str[16];
 
-    pp_level = pc->pp_level - pp_level_sub;
+    pp_level = pc->GetPpLevel() - pp_level_sub;
 
     if (pp_level < 0)
       pp_level = 0;
@@ -999,13 +999,13 @@ void indent_preproc(void)
     if ((cpd.settings[UO_pp_indent].a & AV_ADD) != 0)
       {
         /* Need to add some spaces */
-      pc->str -= pp_level;
+      pc->Str() -= pp_level;
       pc->len += pp_level;
       }
     else if (cpd.settings[UO_pp_indent].a == AV_IGNORE)
       {
-      tmp      = (pc->orig_col <= 16) ? pc->orig_col - 1 : 16;
-      pc->str -= tmp;
+      tmp      = (pc->GetOrigCol() <= 16) ? pc->GetOrigCol() - 1 : 16;
+      pc->Str() -= tmp;
       pc->len += tmp;
       }
 
@@ -1019,6 +1019,6 @@ void indent_preproc(void)
       reindent_line(next, pc->len + 1);
 
     LOG_FMT(LPPIS, "%s: Indent line %d to %d (len %d, next->col %d)\n",
-            __func__, pc->orig_line, pp_level, pc->len, next->column);
+            __func__, pc->GetOrigLine(), GetPpLevel(), pc->len, next->GetColumn());
     }
   }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02103-output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02103-output.cpp
index 3df1cd07..9c7aa714 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02103-output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02103-output.cpp
@@ -111,18 +111,18 @@ void output_parsed(FILE *pfile)
   for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
     {
     fprintf(pfile, "\n%3d> %13.13s[%13.13s][%2d/%2d/%2d][%d/%d/%d][%6x][%d-%d]",
-            pc->orig_line, get_token_name(pc->type),
-            get_token_name(pc->parent_type),
-            pc->column, pc->orig_col, pc->orig_col_end,
-            pc->brace_level, pc->level, pc->pp_level,
-            pc->flags, pc->nl_count, pc->after_tab);
+            pc->GetOrigLine(), get_token_name(pc->GetType()),
+            get_token_name(pc->GetParentType()),
+            pc->GetColumn(), pc->GetOrigCol(), pc->GetOrigColEnd(),
+            pc->GetBraceLevel(), pc->GetLevel(), pc->GetPpLevel(),
+            pc->GetFlags(), pc->GetNlCount(), pc->GetAfterTab());
 
-    if ((pc->type != CT_NEWLINE) && (pc->len != 0))
+    if ((pc->GetType() != CT_NEWLINE) && (pc->len != 0))
       {
-      for (cnt = 0; cnt < pc->column; cnt++)
+      for (cnt = 0; cnt < pc->GetColumn(); cnt++)
         fprintf(pfile, " ");
 
-      fprintf(pfile, "%.*s", pc->len, pc->str);
+      fprintf(pfile, "%.*s", pc->len, pc->GetStr());
       }
     }
 
@@ -143,13 +143,13 @@ void output_options(FILE *pfile)
 
     if (ptr != NULL)
       {
-      if (ptr->type == AT_BOOL)
+      if (ptr->GetType() == AT_BOOL)
         {
         fprintf(pfile, "%3d) %32s = %s\n",
                 ptr->id, ptr->name,
                 cpd.settings[ptr->id].b ? "True" : "False");
         }
-      else if (ptr->type == AT_IARF)
+      else if (ptr->GetType() == AT_IARF)
         {
         fprintf(pfile, "%3d) %32s = %s\n",
                 ptr->id, ptr->name,
@@ -157,7 +157,7 @@ void output_options(FILE *pfile)
                 (cpd.settings[ptr->id].a == AV_REMOVE) ? "Remove" :
                 (cpd.settings[ptr->id].a == AV_FORCE) ? "Force" : "Ignore");
         }
-      else if (ptr->type == AT_LINE)
+      else if (ptr->GetType() == AT_LINE)
         {
         fprintf(pfile, "%3d) %32s = %s\n",
                 ptr->id, ptr->name,
@@ -188,22 +188,22 @@ void output_text(FILE *pfile)
 
   for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
     {
-    if (pc->type == CT_NEWLINE)
+    if (pc->GetType() == CT_NEWLINE)
       {
-      for (cnt = 0; cnt < pc->nl_count; cnt++)
+      for (cnt = 0; cnt < pc->GetNlCount(); cnt++)
         add_char('\n');
 
       cpd.did_newline = 1;
       cpd.column      = 1;
       LOG_FMT(LOUTIND, " xx\n");
       }
-    else if (pc->type == CT_COMMENT_MULTI)
+    else if (pc->GetType() == CT_COMMENT_MULTI)
       output_comment_multi(pc);
-    else if (pc->type == CT_COMMENT_CPP)
+    else if (pc->GetType() == CT_COMMENT_CPP)
       pc = output_comment_cpp(pc);
     else if (pc->len == 0)
         /* don't do anything for non-visible stuff */
-      LOG_FMT(LOUTIND, " <%d> -", pc->column);
+      LOG_FMT(LOUTIND, " <%d> -", pc->GetColumn());
     else
       {
         /* indent to the 'level' first */
@@ -211,38 +211,38 @@ void output_text(FILE *pfile)
         {
         if (cpd.settings[UO_indent_with_tabs].n == 1)
           {
-          lvlcol = 1 + (pc->brace_level * cpd.settings[UO_indent_columns].n);
+          lvlcol = 1 + (pc->GetBraceLevel() * cpd.settings[UO_indent_columns].n);
 
-          if ((pc->column >= lvlcol) && (lvlcol > 1))
+          if ((pc->GetColumn() >= lvlcol) && (lvlcol > 1))
             output_to_column(lvlcol, true);
           }
 
         allow_tabs = (cpd.settings[UO_indent_with_tabs].n == 2) ||
-                     (chunk_is_comment(pc) &&
+                     (pc->IsComment() &&
                       (cpd.settings[UO_indent_with_tabs].n != 0));
 
-        LOG_FMT(LOUTIND, "  %d> col %d/%d - ", pc->orig_line, pc->column, cpd.column);
+        LOG_FMT(LOUTIND, "  %d> col %d/%d - ", pc->GetOrigLine(), pc->GetColumn(), cpd.column);
         }
       else
         {
           /* not the first item on a line */
         if (cpd.settings[UO_align_keep_tabs].b)
-          allow_tabs = pc->after_tab;
+          allow_tabs = pc->GetAfterTab();
         else
           {
           prev       = pc->GetPrev();
           allow_tabs = (cpd.settings[UO_align_with_tabs].b &&
-                        ((pc->flags & PCF_WAS_ALIGNED) != 0) &&
-                        (((pc->column - 1) % cpd.settings[UO_output_tab_size].n) == 0) &&
-                        ((prev->column + prev->len + 1) != pc->column));
+                        ((pc->GetFlags() & PCF_WAS_ALIGNED) != 0) &&
+                        (((pc->GetColumn() - 1) % cpd.settings[UO_output_tab_size].n) == 0) &&
+                        ((prev->GetColumn() + prev->len + 1) != pc->GetColumn()));
           }
 
-        LOG_FMT(LOUTIND, " %d -", pc->column);
+        LOG_FMT(LOUTIND, " %d -", pc->GetColumn());
         }
 
-      output_to_column(pc->column, allow_tabs);
-      add_text_len(pc->str, pc->len);
-      cpd.did_newline = chunk_is_newline(pc);
+      output_to_column(pc->GetColumn(), allow_tabs);
+      add_text_len(pc->GetStr(), pc->len);
+      cpd.did_newline = pc->IsNewline();
       }
     }
   }
@@ -357,17 +357,17 @@ static int calculate_comment_body_indent(const char *str, int len, int start_col
  */
 Chunk *output_comment_cpp(Chunk *first)
   {
-  int col    = first->column;
-  int col_br = 1 + (first->brace_level * cpd.settings[UO_indent_columns].n);
+  int col    = first->GetColumn();
+  int col_br = 1 + (first->GetBraceLevel() * cpd.settings[UO_indent_columns].n);
 
     /* Make sure we have at least one space past the last token */
-  if (first->parent_type == CT_COMMENT_END)
+  if (first->GetParentType() == CT_COMMENT_END)
     {
     Chunk *prev = first->GetPrev();
 
     if (prev != NULL)
       {
-      int col_min = prev->column + prev->len + 1;
+      int col_min = prev->GetColumn() + prev->len + 1;
 
       if (col < col_min)
         col = col_min;
@@ -379,7 +379,7 @@ Chunk *output_comment_cpp(Chunk *first)
 
   if (!cpd.settings[UO_cmt_cpp_to_c].b)
     {
-    add_text_len(first->str, first->len);
+    add_text_len(first->GetStr(), first->len);
     return first;
     }
 
@@ -391,7 +391,7 @@ Chunk *output_comment_cpp(Chunk *first)
       /* next is a newline by definition */
     Chunk *next = first->GetNext();
 
-    if ((next != NULL) && (next->nl_count == 1))
+    if ((next != NULL) && (next->GetNlCount() == 1))
       {
       next = next->GetNext();
 
@@ -403,10 +403,10 @@ Chunk *output_comment_cpp(Chunk *first)
        * level or less
        */
       if ((next != NULL) &&
-          (next->type == CT_COMMENT_CPP) &&
-          (((next->column == 1) && (first->column == 1)) ||
-           ((next->column == col_br) && (first->column == col_br)) ||
-           ((next->column > col_br) && (first->parent_type == CT_COMMENT_END))))
+          (next->GetType() == CT_COMMENT_CPP) &&
+          (((next->GetColumn() == 1) && (first->GetColumn() == 1)) ||
+           ((next->GetColumn() == col_br) && (first->GetColumn() == col_br)) ||
+           ((next->GetColumn() > col_br) && (first->GetParentType() == CT_COMMENT_END))))
         combined = true;
       }
     }
@@ -416,10 +416,10 @@ Chunk *output_comment_cpp(Chunk *first)
       /* nothing to group: just output a single line */
     add_text_len("/*", 2);
 
-    if ((first->str[2] != ' ') && (first->str[2] != '\t'))
+    if ((first->GetStr()[2] != ' ') && (first->GetStr()[2] != '\t'))
       add_char(' ');
 
-    add_text_len(&first->str[2], first->len - 2);
+    add_text_len(&first->GetStr()[2], first->len - 2);
     add_text_len(" */", 3);
     return first;
     }
@@ -441,15 +441,15 @@ Chunk *output_comment_cpp(Chunk *first)
     /* Output combined lines */
   while ((pc = pc->GetNext()) != NULL)
     {
-    if ((pc->type == CT_NEWLINE) && (pc->nl_count == 1))
+    if ((pc->GetType() == CT_NEWLINE) && (pc->GetNlCount() == 1))
       continue;
 
-    if (pc->type != CT_COMMENT_CPP)
+    if (pc->GetType() != CT_COMMENT_CPP)
       break;
 
-    if (((pc->column == 1) && (first->column == 1)) ||
-        ((pc->column == col_br) && (first->column == col_br)) ||
-        ((pc->column > col_br) && (first->parent_type == CT_COMMENT_END)))
+    if (((pc->GetColumn() == 1) && (first->GetColumn() == 1)) ||
+        ((pc->GetColumn() == col_br) && (first->GetColumn() == col_br)) ||
+        ((pc->GetColumn() > col_br) && (first->GetParentType() == CT_COMMENT_END)))
       {
       last = pc;
 cpp_newline:
@@ -459,10 +459,10 @@ cpp_newline:
       add_char(cpd.settings[UO_cmt_star_cont].b ? '*' : ' ');
 cpp_addline:
 
-      if ((pc->str[2] != ' ') && (pc->str[2] != '\t'))
+      if ((pc->GetStr()[2] != ' ') && (pc->GetStr()[2] != '\t'))
         add_char(' ');
 
-      add_text_len(&pc->str[2], pc->len - 2);
+      add_text_len(&pc->GetStr()[2], pc->len - 2);
       }
     }
 
@@ -478,7 +478,7 @@ cpp_addline:
 
 void output_comment_multi(Chunk *pc)
   {
-  int cmt_col = pc->column;
+  int cmt_col = pc->GetColumn();
   const char *cmt_str;
   int remaining;
   char ch;
@@ -492,19 +492,19 @@ void output_comment_multi(Chunk *pc)
 
   prev = pc->GetPrev();
 
-  if ((prev != NULL) && (prev->type != CT_NEWLINE))
-    cmt_col = pc->orig_col;
+  if ((prev != NULL) && (prev->GetType() != CT_NEWLINE))
+    cmt_col = pc->GetOrigCol();
   else
-    col_diff = pc->orig_col - pc->column;
+    col_diff = pc->GetOrigCol() - pc->GetColumn();
 
   //   fprintf(stderr, "Indenting1 line %d to col %d (orig=%d) col_diff=%d\n",
-  //           pc->orig_line, cmt_col, pc->orig_col, col_diff);
+  //           pc->GetOrigLine(), cmt_col, pc->GetOrigCol(), col_diff);
 
-  xtra = calculate_comment_body_indent(pc->str, pc->len, pc->column);
+  xtra = calculate_comment_body_indent(pc->GetStr(), pc->len, pc->GetColumn());
 
   ccol      = 1;
   remaining = pc->len;
-  cmt_str   = pc->str;
+  cmt_str   = pc->GetStr();
   line_len  = 0;
 
   while (remaining > 0)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10000-621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10000-621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10000-621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10000-621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
index c466b45c..c466b45c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10002-623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10002-623_caret-spacing.cpp
index 5058ea4b..5058ea4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10002-623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10002-623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
index 4160ecca..4160ecca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10005-define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10005-define-indentation.cpp
index 24370df9..24370df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10005-define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10005-define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10006-dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10006-dont-detab-strings.cpp
index 11352d82..11352d82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10006-dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10006-dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10007-dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10007-dont-process-defines.cpp
index 10ac8d5b..10ac8d5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10007-dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10007-dont-process-defines.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
index dfd33ac7..dfd33ac7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10020-macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10020-macro_spaces.cpp
index 55a50766..55a50766 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10020-macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10020-macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10021-braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10021-braces_align.cpp
index 40d966f5..40d966f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10021-braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10021-braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10022-foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10022-foreach.cpp
index 2862e6ef..2862e6ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10022-foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10022-foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10023-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10023-for_auto.cpp
index 775031a5..775031a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10023-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10023-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10024-ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10024-ifcomment.cpp
index b41c5c6f..b41c5c6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10024-ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10024-ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10025-qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10025-qtargs.cpp
index 01d94543..01d94543 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10025-qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10025-qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
index 852360a4..852360a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10027-Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10027-Issue_3058.cpp
index 09e1dc92..09e1dc92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10027-Issue_3058.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10027-Issue_3058.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
index 852360a4..852360a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
index e2d8ef8a..e2d8ef8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10047-UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10047-UNI-1334.cpp
index 9a856f91..9a856f91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10047-UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10047-UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10048-UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10048-UNI-1335.cpp
index 891b945a..891b945a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10048-UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10048-UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10050-UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10050-UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10050-UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10050-UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10052-UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10052-UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10052-UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10052-UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10053-UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10053-UNI-1340.cpp
index 2a96aa31..2a96aa31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10053-UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10053-UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10054-UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10054-UNI-1344.cpp
index 43c4429e..43c4429e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10054-UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10054-UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10056-UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10056-UNI-1346.cpp
index af875c3e..af875c3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10056-UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10056-UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10057-UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10057-UNI-1347.cpp
index ec8f350b..ec8f350b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10057-UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10057-UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10060-UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10060-UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10060-UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10060-UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10062-UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10062-UNI-1356.cpp
index c70ca61d..c70ca61d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10062-UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10062-UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10063-UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10063-UNI-1358.cpp
index 120aa9c4..120aa9c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10063-UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10063-UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10069-UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10069-UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10069-UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10069-UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10070-UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10070-UNI-1981.cpp
index d4f74dc3..d4f74dc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10070-UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10070-UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10071-UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10071-UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10071-UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10071-UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10079-UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10079-UNI-9650.cpp
index 0d6cdb46..0d6cdb46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10079-UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10079-UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10080-UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10080-UNI-10496.cpp
index 81122be8..81122be8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10080-UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10080-UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10100-issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10100-issue_564.cpp
index ac5fbef3..ac5fbef3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10100-issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10100-issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10101-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10101-issue_574.cpp
index 6621d455..6621d455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10101-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10101-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10102-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10102-issue_574.cpp
index 0f3b7da3..0f3b7da3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10102-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10102-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10103-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10103-issue_574.cpp
index b87e76fe..b87e76fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10103-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10103-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10566-issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10566-issue_1752.cpp
index 8e16cfa3..8e16cfa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10566-issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10566-issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/11000-UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/11000-UNI-12046.cpp
index 5ffc0da9..5ffc0da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/11000-UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/11000-UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20002-UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20002-UNI-32657.cpp
index eb7655da..eb7655da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20002-UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20002-UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20011-UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20011-UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20011-UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20011-UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30000-cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30000-cout.cpp
index f099751f..f099751f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30000-cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30000-cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30001-alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30001-alt_tokens.cpp
index 02083b88..02083b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30001-alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30001-alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30002-constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30002-constructor.cpp
index f7cbb30d..f7cbb30d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30002-constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30002-constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30003-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30003-strings.cpp
index acef8744..acef8744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30003-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30003-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30010-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30010-class.h
index 2293d9c8..2293d9c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30010-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30010-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30011-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30011-misc.cpp
index 9e3b8c5b..9e3b8c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30011-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30011-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30012-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30012-misc2.cpp
index 62a51621..62a51621 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30012-misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30012-misc2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30013-sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30013-sim.h
index 835ae666..835ae666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30013-sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30013-sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30014-ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30014-ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30014-ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30014-ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30015-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30015-exception.cpp
index 75a4f97e..75a4f97e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30015-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30015-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30016-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30016-custom-open.cpp
index 234f5591..234f5591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30016-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30016-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30017-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30017-custom-open.cpp
index 6acd92e5..6acd92e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30017-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30017-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30018-class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30018-class-addr.h
index 042579dc..042579dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30018-class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30018-class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30019-wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30019-wacky-template.cpp
index cf6e5c87..cf6e5c87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30019-wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30019-wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30020-bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30020-bool.cpp
index 9f9e55b2..9f9e55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30020-bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30020-bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30021-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30021-byref.cpp
index 87f6c44a..87f6c44a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30021-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30021-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30022-extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30022-extern_c.h
index a97d93b8..a97d93b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30022-extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30022-extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30023-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30023-templates.cpp
index 960e0b82..960e0b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30023-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30023-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30024-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30024-class-init.cpp
index 884d5c71..884d5c71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30024-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30024-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30025-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30025-class-init.cpp
index 703686ac..703686ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30025-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30025-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30026-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30026-byref.cpp
index 2534aa05..2534aa05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30026-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30026-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30027-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30027-byref.cpp
index d0598697..d0598697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30027-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30027-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30028-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30028-byref.cpp
index 7a97856d..7a97856d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30028-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30028-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30029-init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30029-init_align.h
index 085f838b..085f838b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30029-init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30029-init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30030-Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30030-Timestamp.h
index 998b7d6f..998b7d6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30030-Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30030-Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30031-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30031-operator.cpp
index f17b865d..f17b865d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30031-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30031-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30032-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30032-operator.cpp
index cfa98ca1..cfa98ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30032-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30032-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30033-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30033-operator.cpp
index 976d919f..976d919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30033-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30033-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30034-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30034-operator_proto.cpp
index 3e5af195..3e5af195 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30034-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30034-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30035-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30035-operator_proto.cpp
index 3824798c..3824798c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30035-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30035-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30036-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30036-operator.cpp
index b1468795..b1468795 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30036-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30036-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30037-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30037-operator_proto.cpp
index d5c7e8fc..d5c7e8fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30037-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30037-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30038-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30038-operator.cpp
index a1bfafe3..a1bfafe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30038-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30038-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30039-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30039-operator_proto.cpp
index 4ec0acf1..4ec0acf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30039-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30039-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30040-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30040-nl-class.h
index 9ccbcf75..9ccbcf75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30040-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30040-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30041-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30041-nl-class.h
index 57e47625..57e47625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30041-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30041-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30042-Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30042-Issue_2020.cpp
index d618f922..d618f922 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30042-Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30042-Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30043-nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
index fbf89d16..fbf89d16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
index 4495d667..4495d667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30045-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30045-nl_func_decl.cpp
index 81d0a00e..81d0a00e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30045-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30045-nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30046-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30046-nl_func_decl.cpp
index 17aa59f0..17aa59f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30046-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30046-nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
index e8a947c9..e8a947c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
index 22f3c700..22f3c700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30049-nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
index 847b7037..847b7037 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30050-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30050-nl-namespace.h
index e515b479..e515b479 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30050-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30050-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30051-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30051-nl-namespace.h
index c51d75be..c51d75be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30051-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30051-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30052-try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30052-try-catch-nl.cpp
index 410a735e..410a735e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30052-try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30052-try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30053-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30053-exception.cpp
index 2c41efbf..2c41efbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30053-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30053-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30054-Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30054-Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30054-Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30054-Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30055-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30055-nl_func.cpp
index 142e6895..142e6895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30055-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30055-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30056-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30056-nl_func.cpp
index f930b703..f930b703 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30056-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30056-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30057-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30058-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30059-Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30059-Issue_2186.cpp
index 2c3081ea..2c3081ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30059-Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30059-Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30060-Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30060-Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30060-Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30060-Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30061-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30061-class-init.cpp
index 7ce41d09..7ce41d09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30061-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30061-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30062-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30062-class-init.cpp
index 53ce4a31..53ce4a31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30062-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30062-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30063-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30063-class-init.cpp
index ad278c90..ad278c90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30063-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30063-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30064-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30064-class-init.cpp
index c44bdfd3..c44bdfd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30064-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30064-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30065-Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30065-Example.h
index 1a868d10..1a868d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30065-Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30065-Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30066-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30066-class-init.cpp
index 1fc8bb57..1fc8bb57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30066-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30066-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30067-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30067-nl_func_type_name.cpp
index a30a08e9..a30a08e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30067-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30067-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30068-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
index 1e4caa86..1e4caa86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30069-class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30069-class-implementation.cpp
index 18481338..18481338 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30069-class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30069-class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30070-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
index c14a06ed..c14a06ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30071-lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30072-lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30072-lineEndings-Win.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30072-lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30072-lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30073-lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30074-bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30074-bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30074-bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30074-bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30075-goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30075-goto.cpp
index 4cccfe2c..4cccfe2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30075-goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30075-goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30076-Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30076-Issue_2594.cpp
index 240e19db..240e19db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30076-Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30076-Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30077-Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30077-Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30077-Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30077-Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30078-Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30078-Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30078-Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30078-Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30079-Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30079-Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30079-Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30079-Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30080-nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30080-nl_brace_brace.cpp
index a9783697..a9783697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30080-nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30080-nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30081-Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30081-Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30081-Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30081-Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30082-Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30082-Issue_931.cpp
index 76a6b856..76a6b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30082-Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30082-Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30083-Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30083-Issue_995-do.cpp
index 2e84d7ce..2e84d7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30083-Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30083-Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30084-Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30084-Issue_1184.cpp
index 848b1e03..848b1e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30084-Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30084-Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30085-align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30085-align_class.cpp
index 552d6947..552d6947 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30085-align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30085-align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30086-align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30086-align_class-constr.cpp
index f6082028..f6082028 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30086-align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30086-align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30087-Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30087-Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30087-Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30087-Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30088-Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30088-Issue_2561.cpp
index aa566966..aa566966 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30088-Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30088-Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30089-Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30089-Issue_2281.cpp
index e0d8727d..e0d8727d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30089-Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30089-Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30090-bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30090-bug_488.cpp
index 268d5ba4..268d5ba4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30090-bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30090-bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30091-bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30091-bug_472.cpp
index e48251fe..e48251fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30091-bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30091-bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30092-bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30092-bug_481.cpp
index 99d8c390..99d8c390 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30092-bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30092-bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30093-bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30093-bug_484.cpp
index 875ff3d2..875ff3d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30093-bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30093-bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30094-bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30094-bug_495.cpp
index d7db1238..d7db1238 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30094-bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30094-bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30095-bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30095-bug_485.cpp
index b5e7842c..b5e7842c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30095-bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30095-bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30096-bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30096-bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30096-bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30096-bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30097-issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30097-issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30097-issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30097-issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30098-Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30098-Issue_2692.cpp
index 4173ad5d..4173ad5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30098-Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30098-Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30099-bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30099-bug_1127.cpp
index 0109baaf..0109baaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30099-bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30099-bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30100-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30100-templates.cpp
index e4dd89e5..e4dd89e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30100-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30100-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30101-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30101-templates.cpp
index 78a60ebd..78a60ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30101-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30101-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30102-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30102-templates.cpp
index 86bbfaf7..86bbfaf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30102-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30102-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30103-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30103-templates.cpp
index adadb882..adadb882 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30103-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30103-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30104-templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30104-templ_class.h
index 802f7e27..802f7e27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30104-templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30104-templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30105-av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30105-av.h
index 6efe8e9b..6efe8e9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30105-av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30105-av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30106-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30106-templates2.cpp
index 48f56d99..48f56d99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30106-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30106-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30107-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30107-templates2.cpp
index a49d4381..a49d4381 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30107-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30107-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30108-templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30108-templates3.cpp
index a0e20d19..a0e20d19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30108-templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30108-templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30109-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30109-templates4.cpp
index 781822e8..781822e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30109-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30109-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30110-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30110-class-init.cpp
index e1b1949c..e1b1949c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30110-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30110-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30111-bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30111-bug_1346.h
index 2ca31e50..2ca31e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30111-bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30111-bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30112-bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30112-bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30112-bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30112-bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30113-bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30113-bug_1452.cpp
index 59a3babd..59a3babd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30113-bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30113-bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30114-bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30114-bug_1462.cpp
index b6a33ceb..b6a33ceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30114-bug_1462.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30114-bug_1462.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30115-Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30115-Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30115-Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30115-Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30116-Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30116-Issue_1052.cpp
index 0e21f136..0e21f136 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30116-Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30116-Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30117-Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30117-Issue_2343.cpp
index a82e1172..a82e1172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30117-Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30117-Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30118-Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30118-Issue_2758.cpp
index 576b1bef..576b1bef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30118-Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30118-Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30119-Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30119-Issue_2879.cpp
index fbc323ae..fbc323ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30119-Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30119-Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30120-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30120-sp_after_angle.cpp
index 04af5289..04af5289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30120-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30120-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30121-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30121-sp_after_angle.cpp
index 8764578e..8764578e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30121-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30121-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30122-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30122-sp_after_angle.cpp
index ee7acae0..ee7acae0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30122-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30122-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30123-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30123-sp_after_angle.cpp
index a791a8ef..a791a8ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30123-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30123-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30124-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30124-sp_after_angle.cpp
index c29f3552..c29f3552 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30124-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30124-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30125-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30125-sp_after_angle.cpp
index a791a8ef..a791a8ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30125-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30125-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30126-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30126-sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30126-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30126-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30127-Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30127-Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30127-Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30127-Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30128-Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30128-Issue_2873.cpp
index 6803fd9a..6803fd9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30128-Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30128-Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30129-Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30129-Issue_2890.cpp
index d03e4f62..d03e4f62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30129-Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30129-Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30130-if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30130-if-constexpr.cpp
index 483317be..483317be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30130-if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30130-if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30131-Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30131-Issue_3010.cpp
index 93fd70db..93fd70db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30131-Issue_3010.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30131-Issue_3010.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30132-sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30132-sp_brace_catch.cpp
index 04c1b9c1..04c1b9c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30132-sp_brace_catch.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30132-sp_brace_catch.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30133-Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30133-Issue_3252.cpp
index 5dc0e67e..5dc0e67e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30133-Issue_3252.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30133-Issue_3252.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30134-Issue_3357.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30134-Issue_3357.cpp
index 83dcc29a..83dcc29a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30134-Issue_3357.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30134-Issue_3357.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30135-Issue_3448.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30135-Issue_3448.cpp
index 19160cf9..19160cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30135-Issue_3448.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30135-Issue_3448.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30136-Issue_3413.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30136-Issue_3413.cpp
index d465f531..d465f531 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30136-Issue_3413.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30136-Issue_3413.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30137-Issue_3513-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30137-Issue_3513-0.cpp
index c55df54a..c55df54a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30137-Issue_3513-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30137-Issue_3513-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30138-Issue_3513-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30138-Issue_3513-1.cpp
index 560e6d51..560e6d51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30138-Issue_3513-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30138-Issue_3513-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30139-Issue_3604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30139-Issue_3604.cpp
index a96b3437..a96b3437 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30139-Issue_3604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/30140-Issue_3785.cpp
new file mode 100644
index 00000000..94988dd6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30140-Issue_3785.cpp
@@ -0,0 +1,24 @@
+void output_text(FILE *pfile)
+{
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
+   {
+      if (pc->GetTrackingData() != nullptr)
+      {
+         if (many > 1)
+         {
+         }
+#define \
+        EXTRA_LOG_2
+         char *old_one = nullptr;
+      }
+   }
+} // output_text
+
+
+void dump_step(const char *filename, const char *step_description)
+{
+   static int file_num = 0;
+   char       buffer[256];
+   FILE       *dump_file;
+   fclose(dump_file);
+} // dump_step
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30200-bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30200-bug_1862.cpp
index c5357c86..c5357c86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30200-bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30200-bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30201-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30201-cmt_indent.cpp
index ed27ffca..ed27ffca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30201-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30201-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30202-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30202-cmt_indent.cpp
index 95c47d6e..95c47d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30202-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30202-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30203-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30203-cmt_indent.cpp
index 05cc2df3..05cc2df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30203-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30203-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30204-comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30204-comment-align.cpp
index afaaafef..afaaafef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30204-comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30204-comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30205-cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30205-cmt_right.cpp
index bcca4e2e..bcca4e2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30205-cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30205-cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
index d020e171..d020e171 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30207-cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30207-cmt_indent_pp.h
index 50e35c8d..50e35c8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30207-cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30207-cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30208-bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30208-bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30208-bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30208-bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30209-bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30209-bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30209-bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30209-bug_1134.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30210-bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30210-bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30210-bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30210-bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
index 34c09203..34c09203 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
index f9316598..f9316598 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30213-align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30213-align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30213-align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30213-align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30214-align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30214-align_across_braces.cpp
index 199ede8d..199ede8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30214-align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30214-align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30215-Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30215-Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30215-Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30215-Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30216-Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30216-Issue_2302.cpp
index e2684ae6..e2684ae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30216-Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30216-Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30217-2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30217-2138.cpp
index 8d1d7462..8d1d7462 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30217-2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/30218-Issue_3710.cpp
new file mode 100644
index 00000000..b8e5b421
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30218-Issue_3710.cpp
@@ -0,0 +1,4 @@
+void foo()
+{
+	PyErr_SetString( PyExc_KeyError, sstr.str().c_str() );
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30220-bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30220-bug_1340.cpp
index f64bc6a0..f64bc6a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30220-bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30220-bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30221-Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30221-Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30221-Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30221-Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30223-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30223-sp_enum_colon.cpp
index 11d7320b..11d7320b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30223-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30223-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30224-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30224-sp_enum_colon.cpp
index 804fe1ae..804fe1ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30224-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30224-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30225-Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30225-Issue_3176.cpp
index 2384027d..2384027d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30225-Issue_3176.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30225-Issue_3176.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30226-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30226-sp_enum_colon.cpp
index be23e687..be23e687 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30226-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30226-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
index 8386e215..8386e215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
index 666f834c..666f834c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
index 98640667..98640667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30230-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30230-sp_type_func.cpp
index 0d17364f..0d17364f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30230-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30230-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30231-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30231-sp_type_func.cpp
index d7d69cc8..d7d69cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30231-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30231-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30232-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30232-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30232-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30232-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30233-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30233-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30233-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30233-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30234-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30234-functype_param.cpp
index 32419616..32419616 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30234-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30234-functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30235-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30235-functype_param.cpp
index 9e9f5ecc..9e9f5ecc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30235-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30235-functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30236-Issue_750.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30236-Issue_750.cpp
index bf7d1100..bf7d1100 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30236-Issue_750.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30236-Issue_750.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30240-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30240-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30240-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30240-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30241-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30241-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30241-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30241-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30242-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30242-align_func_params.cpp
index 512233cd..512233cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30242-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30242-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30243-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30243-align_func_params.cpp
index 82434066..82434066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30243-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30243-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30244-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30244-align_func_params.cpp
index 5efed666..5efed666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30244-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30244-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30245-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30245-align_func_params.cpp
index a44170a9..a44170a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30245-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30245-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30246-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30246-align_func_params.cpp
index 9def11e6..9def11e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30246-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30246-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30247-Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30247-Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30247-Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30247-Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30248-Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30248-Issue_2831.cpp
index c099567a..c099567a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30248-Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30248-Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30249-align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30249-align-330.cpp
index a92e1545..a92e1545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30249-align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30249-align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30250-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30250-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30250-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30250-align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30251-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30251-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30251-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/30252-Issue_3691.h
new file mode 100644
index 00000000..fb1ec761
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30252-Issue_3691.h
@@ -0,0 +1 @@
+void test(std::function<void(const int&)> func);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30253-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30253-align_left_shift.cpp
index 7c98226d..7c98226d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30253-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30253-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30254-align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30254-align_left_shift2.cpp
index bfea744c..bfea744c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30254-align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30254-align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30255-align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30255-align_constr.cpp
index 380f0c8b..380f0c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30255-align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30255-align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30256-func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30256-func_call.cpp
index e3eff88c..e3eff88c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30256-func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30256-func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30257-func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30257-func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30257-func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30257-func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30258-casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30258-casts.cpp
index d8a496fb..d8a496fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30258-casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30258-casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
index 7b63b639..7b63b639 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30260-var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30260-var_def_gap.cpp
index 7333d292..7333d292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30260-var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30260-var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30261-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
index 8512377e..8512377e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30262-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
index 4996a3d3..4996a3d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30263-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
index 1e10f370..1e10f370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30264-Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30264-Issue_2668.cpp
index da8e118f..da8e118f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30264-Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30264-Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30265-long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30265-long_br_cmt.cpp
index 8ebdcec9..8ebdcec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30265-long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30265-long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30266-Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30266-Issue_2921.cpp
index 53e3c495..53e3c495 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30266-Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30266-Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30267-Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30267-Issue_2930.cpp
index 00cff53b..00cff53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30267-Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30267-Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30268-Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30268-Issue_3018.cpp
index ddbb473e..ddbb473e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30268-Issue_3018.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30268-Issue_3018.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30270-const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30270-const_throw.cpp
index 44f0ca68..44f0ca68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30270-const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30270-const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30271-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30271-sp_throw_paren.cpp
index 21ce9291..21ce9291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30271-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30271-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30272-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30272-sp_throw_paren.cpp
index ea851aff..ea851aff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30272-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30272-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
index ee0d705b..ee0d705b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
index 93cc7f86..93cc7f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30275-bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30275-bug_1321.cpp
index 5e708c11..5e708c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30275-bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30275-bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30278-bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30278-bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30278-bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30278-bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
index c8b92481..80456e65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
@@ -1,12 +1,12 @@
 (tmp
-	? chunk_is_newline(tmp)
+	? tmp->IsNewline()
 		? "newline"
-		: chunk_is_comment(tmp)
+		: tmp->IsComment()
 			? "comment"
 			: "other"
-	: chunk_is_newline(tmp)
+	: tmp->IsNewline()
 		? "newline"
-		: chunk_is_comment(tmp)
+		: tmp->IsComment()
 			? "comment"
 			: "other");
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30280-sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30280-sf557.cpp
index 287bc9c1..287bc9c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30280-sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30280-sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30281-Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30281-Issue_2478.cpp
index 40674590..40674590 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30281-Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30281-Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30282-Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30282-Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30282-Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30282-Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30283-Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30283-Issue_3321.h
index 9444d24c..9444d24c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30283-Issue_3321.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30283-Issue_3321.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30284-Issue_2957.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30284-Issue_2957.cpp
index bd52cb8c..bd52cb8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30284-Issue_2957.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30284-Issue_2957.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30285-Issue_2971.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30285-Issue_2971.cpp
index 52e7a253..52e7a253 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30285-Issue_2971.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/30286-Issue_3558.cpp
new file mode 100644
index 00000000..561821ee
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30286-Issue_3558.cpp
@@ -0,0 +1,4 @@
+int main()
+{
+        return foo ? foo : bar & mask;
+}
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.76.0/tests/expected/cpp/30287-Issue_3786.cpp
new file mode 100644
index 00000000..dfb53cdc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30287-Issue_3786.cpp
@@ -0,0 +1,4 @@
+unsigned char wow[][2] = {
+        { 0,   24,},
+        { 152, 1,},
+};
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.76.0/tests/expected/cpp/30287-Issue_3786.rerun.cpp
new file mode 100644
index 00000000..41ebe641
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30287-Issue_3786.rerun.cpp
@@ -0,0 +1,4 @@
+unsigned char wow[][2] = {
+        { 0,   24, },
+        { 152, 1,  },
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30290-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30290-align_left_shift.cpp
index 8591a642..8591a642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30290-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30290-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30291-indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30291-indent_shift.cpp
index bc1ae2e5..bc1ae2e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30291-indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30291-indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30292-eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30292-eigen.cpp
index aa43434a..aa43434a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30292-eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30292-eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30293-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30293-pos_shift.cpp
index d4a8f1ed..d4a8f1ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30293-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30293-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30294-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30294-pos_shift.cpp
index badc9798..badc9798 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30294-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30294-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30295-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30295-pos_shift.cpp
index efb19263..efb19263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30295-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30295-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30300-enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30300-enum_shr.cpp
index 26e0d08e..26e0d08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30300-enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30300-enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30301-enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30301-enum_class.h
index 7ad5e9ea..7ad5e9ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30301-enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30301-enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30302-bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30302-bug_1315.cpp
index 584f9a00..584f9a00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30302-bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30302-bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30303-Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30303-Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30303-Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30303-Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30310-braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30310-braced_init_list.cpp
index 116462c2..116462c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30310-braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30310-braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30311-uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30311-uniform_initialization.cpp
index 64da585d..64da585d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30311-uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30311-uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30312-return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30312-return_init_list.cpp
index ef91c528..ef91c528 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30312-return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30312-return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30313-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30313-sp_brace_brace.cpp
index 2ae91737..2ae91737 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30313-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30313-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30314-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30314-sp_brace_brace.cpp
index b7ca9839..b7ca9839 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30314-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30314-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30315-return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30315-return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30315-return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30315-return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30316-Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30316-Issue_2428.cpp
index b2a0a139..b2a0a139 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30316-Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30316-Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
index 3c22d790..3c22d790 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30318-Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30318-Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30318-Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30318-Issue_2949.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30319-Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30319-Issue_2886.cpp
index 0474c710..0474c710 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30319-Issue_2886.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30319-Issue_2886.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30320-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30320-returns.cpp
index d1ac08c0..d1ac08c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30320-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30320-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30321-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30321-returns.cpp
index 1abe1e54..1abe1e54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30321-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30321-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30322-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30322-returns.cpp
index a61b0fcf..a61b0fcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30322-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30322-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30323-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30323-returns.cpp
index b12cd7eb..b12cd7eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30323-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30323-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30324-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30324-returns.cpp
index fede22db..fede22db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30324-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30324-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30325-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30325-returns.cpp
index d797f9c7..d797f9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30325-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30325-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30326-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30326-indent_off_after_return.cpp
index 6cd6d8e4..6cd6d8e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30326-indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30326-indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30327-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30327-indent_off_after_return.cpp
index 6cd6d8e4..6cd6d8e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30327-indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30327-indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30328-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
index b75c35b1..b75c35b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30329-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
index 83837910..83837910 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30330-Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30330-Issue_3080.cpp
index 75c6072b..75c6072b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30330-Issue_3080.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30330-Issue_3080.cpp
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.76.0/tests/expected/cpp/30353-indent_ternary-1.cpp
new file mode 100644
index 00000000..c5fa89e5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30353-indent_ternary-1.cpp
@@ -0,0 +1,76 @@
+namespace ns1 {
+int getval(void);
+void baz(void);
+}
+
+
+int foo(int in1, int in2, float in3, double in4) {
+	int a; int b; int c; int d;
+	int e; int f; int g; int h;
+
+	a = (in1 < 10) ? in2 :
+	                 ns1::getval();
+
+	b = (in1 < 20) ? in2 :
+	                 int(in3 * 0.4);
+
+	c = (in1 < 30) ? in2 :
+	                 1.25 * in4;
+
+	d = (in1 < 40) ? in2 :
+	                 -3;
+
+	e = (in1 < 50) ? in2 :
+	                 ~3 ^ in1;
+
+	f = (in1 < 60) ? in2 :
+	                 !(in1 == in2);
+
+	g = (in1 < 70) ? in2 :
+	                 ++in1;
+
+	h = (in1 < 80) ? in2 :
+	                 in1 * 2;
+
+	if ((in1 < 10) ? in2 :
+	                 ns1::getval()) {
+		ns1::baz();
+	}
+
+	if ((in1 < 20) ? in2 :
+	                 int(in3 * 0.4)) {
+		ns1::baz();
+	}
+
+	if ((in1 < 30) ? in2 :
+	                 1.25 * in4) {
+		ns1::baz();
+	}
+
+	if ((in1 < 40) ? in2 :
+	                 -3) {
+		ns1::baz();
+	}
+
+	if ((in1 < 50) ? in2 :
+	                 ~3 ^ in1) {
+		ns1::baz();
+	}
+
+	if ((in1 < 60) ? in2 :
+	                 !(in1 == in2)) {
+		ns1::baz();
+	}
+
+	if ((in1 < 70) ? in2 :
+	                 ++in1) {
+		ns1::baz();
+	}
+
+	if ((in1 < 80) ? in2 :
+	                 in1 * 2) {
+		ns1::baz();
+	}
+
+	return a+b+c+d+e+f+g+h;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
index 15cc6e3a..15cc6e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30401-Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30401-Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30401-Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30401-Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30701-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30701-function-def.cpp
index 89261c8e..89261c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30701-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30701-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30702-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30702-function-def.cpp
index c1fb4ed4..c1fb4ed4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30702-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30702-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30703-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30703-function-def.cpp
index c604152d..c604152d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30703-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30703-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30705-func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30705-func_param.cpp
index 8bdb0ce8..8bdb0ce8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30705-func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30705-func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30706-bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30706-bug_1020.cpp
index f0e9e60d..f0e9e60d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30706-bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30706-bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30711-semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30711-semicolons.cpp
index de28deef..de28deef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30711-semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30711-semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30712-bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30712-bug_1158.cpp
index 2a9ba76d..2a9ba76d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30712-bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30712-bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
index 890f2eba..890f2eba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30714-Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30714-Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30714-Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30714-Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30715-Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30715-Issue_2942.cpp
index dbecc7f4..dbecc7f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30715-Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30715-Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30720-custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30720-custom-open-2.cpp
index 4d05944a..4d05944a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30720-custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30720-custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30721-Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30721-Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30721-Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30721-Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30730-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30730-qt-1.cpp
index 5d0273e2..5d0273e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30730-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30730-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30731-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30731-qt-1.cpp
index 55b2459b..55b2459b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30731-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30731-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30732-Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30732-Issue_2734.cpp
index 27dfdc70..27dfdc70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30732-Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30732-Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30740-sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30740-sef.cpp
index 8730ba15..8730ba15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30740-sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30740-sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30741-al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30741-al.cpp
index 1c911bf2..1c911bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30741-al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30741-al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30742-delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30742-delete.cpp
index c33aa682..c33aa682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30742-delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30742-delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30745-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30745-Issue_2170.cpp
index f1edafd8..f1edafd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30745-Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30745-Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30746-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
index 7dff7dd5..7dff7dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30747-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
index 30d315a7..30d315a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30748-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
index 9b55a964..9b55a964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30750-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30750-lambda.cpp
index daa4bac4..daa4bac4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30750-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30750-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30751-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30751-lambda.cpp
index 291610c5..291610c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30751-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30751-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30752-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30752-lambda.cpp
index 5c0f72b0..5c0f72b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30752-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30752-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30753-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30753-lambda2.cpp
index d91798a6..d91798a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30753-lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30753-lambda2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30754-bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30754-bug_i_682.h
index 51c58e23..51c58e23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30754-bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30754-bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30755-bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30755-bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30755-bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30755-bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30756-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30756-bug_1296.cpp
index 7f7757c4..7f7757c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30756-bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30756-bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30757-Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30757-Issue_3054.cpp
index 53edc388..53edc388 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30757-Issue_3054.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30757-Issue_3054.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30758-Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30758-Issue_3054-2.cpp
index e4c1c8da..e4c1c8da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30758-Issue_3054-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30758-Issue_3054-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30759-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30759-lambda2.cpp
index 09c779b5..09c779b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30759-lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30759-lambda2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30760-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30760-bug_1296.cpp
index a5535041..a5535041 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30760-bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30760-bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30761-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30761-out-668.cpp
index 8829c0ce..8829c0ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30761-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30761-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30762-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30762-out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30762-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30762-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30763-Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30763-Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30763-Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30763-Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30764-Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30764-Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30764-Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30764-Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30765-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30765-lambda.cpp
index 05e372e3..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30765-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30765-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30766-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30766-lambda.cpp
index 05e372e3..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30766-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30766-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30767-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30767-lambda.cpp
index 05e372e3..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30767-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30767-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
index e25d0496..e25d0496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30770-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30770-lambda.cpp
index 5bce0d31..5bce0d31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30770-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30770-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30771-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30771-lambda.cpp
index acc5b530..acc5b530 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30771-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30771-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30772-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30772-lambda.cpp
index 304e4d10..304e4d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30772-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30772-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30773-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30773-lambda.cpp
index f494244a..f494244a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30773-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30773-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30774-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30774-lambda.cpp
index f494244a..f494244a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30774-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30774-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30775-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30775-lambda.cpp
index 80e9c8f9..80e9c8f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30775-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30775-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
index e0c1985d..e0c1985d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
index f882a211..f882a211 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30781-lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30781-lambda_brace_list.cpp
index 8626f5af..8626f5af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30781-lambda_brace_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30781-lambda_brace_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30790-Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30790-Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30790-Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30790-Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30791-Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30791-Issue_3203.cpp
index 519d29dd..519d29dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30791-Issue_3203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30791-Issue_3203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30800-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
index dc988ce1..dc988ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30801-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
index c23b0d4a..c23b0d4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30802-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
index cf2bff2d..cf2bff2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30803-bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30803-bug_1403.cpp
index 209c0173..209c0173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30803-bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30803-bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30805-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30805-ptr-star.cpp
index fcefa84f..fcefa84f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30805-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30805-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30806-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30806-ptr-star.cpp
index 76659df9..76659df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30806-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30806-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30807-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30807-ptr-star.cpp
index 55478e3f..55478e3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30807-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30807-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30808-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30808-ptr-star.cpp
index 68cb8151..68cb8151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30808-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30808-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30809-bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30809-bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30809-bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30809-bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30810-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30810-ptr-star.cpp
index fa88b0bc..fa88b0bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30810-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30810-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30811-misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30811-misc3.cpp
index 9ca06c3c..9ca06c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30811-misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30811-misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30812-misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30812-misc4.cpp
index 5ddaffb0..5ddaffb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30812-misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30812-misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30813-misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30813-misc5.cpp
index e8ffaf27..e8ffaf27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30813-misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30813-misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30814-misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30814-misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30814-misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30814-misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30815-cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30815-cmt-reflow.cpp
index 8bd50283..8bd50283 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30815-cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30815-cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30816-for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30816-for_long.cpp
index 5483d4c8..5483d4c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30816-for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30816-for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
index 9acbac58..9acbac58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30818-bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30818-bug_1169.cpp
index b1138a57..b1138a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30818-bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30818-bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30819-bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30819-bug_1170.cpp
index 18e029cb..18e029cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30819-bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30819-bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30820-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30820-pp-define-indent.cpp
index 0d7892a2..0d7892a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30820-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30820-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30821-pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30821-pp_indent_case.cpp
index 70b1b9c7..70b1b9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30821-pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30821-pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30822-pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30822-pp_indent_brace.cpp
index d1decdf6..d1decdf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30822-pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30822-pp_indent_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30823-pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
index b01c6bbe..b01c6bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30824-pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30824-pp_indent_extern.cpp
index 995db611..995db611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30824-pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30824-pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30825-Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30825-Issue_1966.cpp
index 12a8084b..12a8084b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30825-Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30825-Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30826-Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30826-Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30826-Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30826-Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30827-Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30827-Issue_1167.cpp
index 6410326c..6410326c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30827-Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30827-Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30828-bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30828-bug_1691.cpp
index e93f7f74..e93f7f74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30828-bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30828-bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30829-Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30829-Issue_2726.cpp
index bb7f1d4b..bb7f1d4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30829-Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30829-Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30830-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30830-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30830-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30830-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30831-kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30831-kw_subst2.cpp
index b5e58eac..b5e58eac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30831-kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30831-kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30832-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30832-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30832-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30832-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30840-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30840-nl_func_type_name.cpp
index a4302001..a4302001 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30840-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30840-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30841-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30841-nl_func_type_name.cpp
index 5997a5c3..5997a5c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30841-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30841-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30842-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30842-nl_func_type_name.cpp
index a826af48..a826af48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30842-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30842-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30843-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30843-nl_func_type_name.cpp
index b1ead857..b1ead857 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30843-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30843-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30844-Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30844-Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30844-Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30844-Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30845-deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30845-deref.cpp
index 9705b51f..9705b51f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30845-deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30845-deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30846-Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30846-Issue_3197.h
index 76331aa3..76331aa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30846-Issue_3197.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30846-Issue_3197.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
index 9cc04a18..9cc04a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30852-Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30852-Issue_2138.cpp
index 3a8fa83c..3a8fa83c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30852-Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30852-Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30853-noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30853-noexcept.cpp
index 60f2edd4..60f2edd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30853-noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30853-noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30854-Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30854-Issue_1703.cpp
index af32d661..af32d661 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30854-Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30854-Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30855-cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30855-cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30855-cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30855-cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
index dc9e4160..dc9e4160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
index 29f75936..29f75936 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30860-sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30860-sf574.cpp
index 58810404..58810404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30860-sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30860-sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30870-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30870-cmt_insert.cpp
index cf5ac204..cf5ac204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30870-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30870-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30871-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30871-cmt_insert.cpp
index a169795a..a169795a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30871-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30871-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30872-Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30872-Issue_2752.cpp
index b305b50f..b305b50f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30872-Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30872-Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30880-bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30880-bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30880-bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30880-bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30881-bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30881-bug_1758-f.cpp
index 24bb563b..24bb563b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30881-bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30881-bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30900-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30900-region.cpp
index 27823ca6..27823ca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30900-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30900-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30901-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30901-region.cpp
index b7bebae8..b7bebae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30901-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30901-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30902-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30902-region.cpp
index 39b20ea6..39b20ea6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30902-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30902-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30903-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30903-region.cpp
index d6e3403a..d6e3403a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30903-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30903-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30907-Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30907-Issue_1813.cpp
index d5a3cc71..d5a3cc71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30907-Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30907-Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30908-Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30908-Issue_1813-2.cpp
index 310de82f..310de82f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30908-Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30908-Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30909-Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30909-Issue_1813-3.cpp
index 08c8405d..08c8405d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30909-Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30909-Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30910-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30910-indent_namespace.h
index d569a3ca..d569a3ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30910-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30910-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30911-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30911-indent_namespace.h
index 6f80dc3b..6f80dc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30911-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30911-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30912-long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30912-long_namespace.cpp
index 80af6e83..80af6e83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30912-long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30912-long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30913-indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30913-indent_namespace2.h
index 196b2322..196b2322 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30913-indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30913-indent_namespace2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30914-indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
index 24a9b935..24a9b935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30915-bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30915-bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30915-bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30915-bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30916-Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30916-Issue_1737.cpp
index 06b0866b..06b0866b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30916-Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30916-Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30917-Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30917-Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30917-Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30917-Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30918-Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30918-Issue_2345-4.cpp
index f82d757d..f82d757d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30918-Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30918-Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30919-Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30919-Issue_2387.cpp
index 526278d6..526278d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30919-Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30919-Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30920-indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30920-indent-off.cpp
index f9eccdb8..f9eccdb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30920-indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30920-indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30921-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30921-variadic-template.h
index f159e700..f159e700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30921-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30921-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30922-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30922-variadic-template.h
index 0a1bd443..0a1bd443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30922-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30922-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30923-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30923-sf.2886991.cpp
index 61dc7c21..61dc7c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30923-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30923-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30924-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30924-sf.2886991.cpp
index ce5e0b93..ce5e0b93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30924-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30924-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30925-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30925-function-def.cpp
index 2d6df544..2d6df544 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30925-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30925-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30926-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30926-function-def.cpp
index 78b23a14..78b23a14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30926-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30926-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30927-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30927-function-def.cpp
index bceb00f6..bceb00f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30927-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30927-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30928-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30928-function-def.cpp
index b14ecb11..b14ecb11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30928-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30928-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30929-bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30929-bug_1324.cpp
index 1aca5762..1aca5762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30929-bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30929-bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30930-indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30930-indent_var_def.cpp
index 5b3ee4e2..5b3ee4e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30930-indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30930-indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30931-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
index c505389f..c505389f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30932-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
index 70b7304e..70b7304e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
index 8a775135..8a775135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
index 6af21978..6af21978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30935-indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30935-indent-misc.cpp
index ad8de7b0..ad8de7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30935-indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30935-indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30936-indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30936-indent_braces_no.h
index 725b0402..725b0402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30936-indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30936-indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30937-indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30937-indent_param.cpp
index 31569ec1..31569ec1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30937-indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30937-indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30938-indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30938-indent_switch_pp.cpp
index dd910c56..dd910c56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30938-indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30938-indent_switch_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
index a1453862..a1453862 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30940-case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30940-case-brace-remove.cpp
index cd163570..cd163570 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30940-case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30940-case-brace-remove.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30941-Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30941-Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30941-Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30941-Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30942-Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30942-Issue_1692.cpp
index 89de1d6a..89de1d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30942-Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30942-Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30943-Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30943-Issue_2735.cpp
index 3e292425..3e292425 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30943-Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30943-Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30945-sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30945-sf.3266678.cpp
index 810b5105..810b5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30945-sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30945-sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30946-sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30946-sf.3315874.h
index 05161496..05161496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30946-sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30946-sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30947-bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30947-bug_1689.cpp
index 40d34d61..40d34d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30947-bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30947-bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30948-sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
index 4abfe954..4abfe954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30949-Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30949-Issue_2757.cpp
index ba83c29e..ba83c29e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30949-Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30949-Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
index 943d303b..943d303b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
index c7e25f1c..c7e25f1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
index ad0e38d5..ad0e38d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30953-constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30953-constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30953-constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30953-constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30954-Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30954-Issue_2305.cpp
index 7458b913..7458b913 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30954-Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30954-Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30955-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30955-indent_ctor_init.cpp
index 55982328..55982328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30955-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30955-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30956-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30956-indent_ctor_init.cpp
index 29a146a9..29a146a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30956-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30956-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30957-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30957-class-init.cpp
index faa28873..faa28873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30957-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30957-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
index 8ff2405f..8ff2405f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30960-Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30960-Issue_2151.cpp
index d0ee05d2..d0ee05d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30960-Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30960-Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30961-Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30961-Issue_2232.cpp
index 7867820b..7867820b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30961-Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30961-Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30963-Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30963-Issue_2907.cpp
index c0192c4d..c0192c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30963-Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30963-Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30964-Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30964-Issue_2823.cpp
index c633398f..c633398f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30964-Issue_2823.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30964-Issue_2823.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30970-Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30970-Issue_2219.cpp
index e08cb889..e08cb889 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30970-Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30970-Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30971-Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30971-Issue_2224.cpp
index 0c454905..0c454905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30971-Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30971-Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30972-Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30972-Issue_2229.cpp
index 0c44ed6a..0c44ed6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30972-Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30972-Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30973-Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30973-Issue_2236.cpp
index 7f7f01f5..7f7f01f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30973-Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30973-Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30974-using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30974-using-alias-in-define.cpp
index 1b4153d8..1b4153d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30974-using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30974-using-alias-in-define.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31000-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31000-digraph.cpp
index e985dae6..e985dae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31000-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31000-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31001-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31001-digraph.cpp
index 641390a6..641390a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31001-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31001-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31050-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31050-pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31050-pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31050-pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31051-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31051-pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31051-pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31051-pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
index fdf9067a..fdf9067a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
index 59342e57..59342e57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
index 5efbf20e..5efbf20e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
index a1b93406..a1b93406 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31400-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31400-trailing_return.cpp
index ef642eec..ef642eec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31400-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31400-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31401-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31401-trailing_return.cpp
index bfc09585..bfc09585 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31401-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31401-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31402-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31402-trailing_return.cpp
index 01adfc69..01adfc69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31402-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31402-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
index 9b7da565..9b7da565 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
index 7ecf920d..7ecf920d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
index 472f66b3..472f66b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
index 2288f111..2288f111 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
index 018b3dd6..018b3dd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31562-sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31562-sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31562-sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31562-sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31567-sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31567-sf567.cpp
index 6d96731d..6d96731d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31567-sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31567-sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31568-Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31568-Issue_2368.cpp
index 82b8c59c..82b8c59c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31568-Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31568-Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31583-sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31583-sf583.cpp
index 34fc0c21..34fc0c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31583-sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31583-sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31593-sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31593-sf593.cpp
index 2d4499e6..2d4499e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31593-sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31593-sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31594-issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31594-issue_672.cpp
index 499f3168..499f3168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31594-issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31594-issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31595-issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31595-issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31595-issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31595-issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31596-issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31596-issue_1782.cpp
index 664ead7f..664ead7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31596-issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31596-issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31597-issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31597-issue_1804.cpp
index c98ecdef..c98ecdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31597-issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31597-issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31598-Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31598-Issue_1753.cpp
index 9f7da399..9f7da399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31598-Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31598-Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31599-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31599-parameter-packs.cpp
index 4961aa2b..4961aa2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31599-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31599-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31600-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31600-parameter-packs.cpp
index 5d1cd8e8..5d1cd8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31600-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31600-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31601-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31601-parameter-packs.cpp
index 0394fe8b..0394fe8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31601-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31601-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31602-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31602-parameter-packs.cpp
index 15d0a382..15d0a382 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31602-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31602-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31603-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31603-parameter-packs.cpp
index 3a810b8a..3a810b8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31603-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31603-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31604-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31604-parameter-packs.cpp
index 2a180b34..2a180b34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31604-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31604-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31605-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31605-parameter-packs.cpp
index a08af3cf..a08af3cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31605-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31605-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31606-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31606-parameter-packs.cpp
index a73e2c43..a73e2c43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31606-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31606-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31607-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31607-parameter-packs.cpp
index 153fc615..153fc615 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31607-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31607-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31608-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31608-parameter-packs.cpp
index 13ba49db..13ba49db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31608-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31608-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31609-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31609-parameter-packs.cpp
index e00841b4..e00841b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31609-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31609-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31610-Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31610-Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31610-Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31610-Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31611-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31611-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31611-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31611-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31612-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31612-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31612-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31612-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31613-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31613-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31613-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31613-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31614-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31614-Issue_3309.cpp
index d6dd1dac..d6dd1dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31614-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31614-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31615-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31615-Issue_3309.cpp
index 84ee58aa..84ee58aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31615-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31615-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31616-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31616-Issue_3309.cpp
index c269ddb0..c269ddb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31616-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31616-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31620-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31620-sp_after_type.cpp
index 460c0dc2..460c0dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31620-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31620-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31621-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31621-sp_after_type.cpp
index b1ffd02b..b1ffd02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31621-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31621-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31622-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31622-sp_after_type.cpp
index a924423a..a924423a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31622-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31622-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31623-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31623-sp_after_type.cpp
index 5d923c27..5d923c27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31623-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31623-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31624-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31624-sp_after_type.cpp
index b66aba0c..b66aba0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31624-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31624-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31625-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31625-sp_after_type.cpp
index add7b57e..add7b57e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31625-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31625-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31626-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31626-issue_1916.cpp
index 56ce6f4c..56ce6f4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31626-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31626-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31627-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31627-issue_1916.cpp
index f84334a4..f84334a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31627-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31627-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31628-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31628-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31628-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31628-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31629-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31629-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31629-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31629-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31630-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31630-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31630-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31630-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31631-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31631-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31631-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31631-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31632-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31632-issue_1916.cpp
index 292b6837..292b6837 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31632-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31632-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31633-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31633-sp_after_decltype.cpp
index 6a62e6f2..6a62e6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31633-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31633-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31634-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31634-sp_after_decltype.cpp
index c48543be..c48543be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31634-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31634-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31635-sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31635-sp_decltype.cpp
index 84b157f1..84b157f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31635-sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31635-sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31636-Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31636-Issue_1923.cpp
index 8c3ebe66..8c3ebe66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31636-Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31636-Issue_1923.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31637-Issue_3446.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31637-Issue_3446.cpp
index 9577cfa8..9577cfa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31637-Issue_3446.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31637-Issue_3446.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31660-issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31660-issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31660-issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31660-issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31661-Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31661-Issue_3097.cpp
index ede644ad..ede644ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31661-Issue_3097.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/31662-var_def_blks.cpp
new file mode 100644
index 00000000..016aacec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31662-var_def_blks.cpp
@@ -0,0 +1,32 @@
+unsigned a;
+char b;
+int bar(void);
+unsigned c;
+char d;
+int foo(void) {
+	char buf[1000] = {0};
+	size_t len;
+	float amount;
+	double remainder;
+
+	bar();
+	uint64_t quux;
+	uint64_t quack;
+	for (int i = 0; i < 1000; i++) {
+		uint64_t checksum;
+		double remainder;
+		buf[i] += len;
+		uint32_t xyzzy;
+		uint32_t quark;
+	}
+	float amount;
+	double remainder;
+	baz();
+	uint32_t llama;
+	uint32_t treehouse;
+}
+char * w;
+uint8_t x;
+int baz(void);
+long y;
+int z;
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.76.0/tests/expected/cpp/31663-var_def_blks.cpp
new file mode 100644
index 00000000..256d0ed6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31663-var_def_blks.cpp
@@ -0,0 +1,45 @@
+unsigned a;
+char b;
+int bar(void);
+
+
+unsigned c;
+char d;
+int foo(void) {
+	char buf[1000] = {0};
+	size_t len;
+	float amount;
+	double remainder;
+	bar();
+
+
+	uint64_t quux;
+	uint64_t quack;
+	for (int i = 0; i < 1000; i++) {
+		uint64_t checksum;
+		double remainder;
+		buf[i] += len;
+
+
+		uint32_t xyzzy;
+		uint32_t quark;
+	}
+
+
+	float amount;
+	double remainder;
+	baz();
+
+
+	uint32_t llama;
+	uint32_t treehouse;
+}
+
+
+char * w;
+uint8_t x;
+int baz(void);
+
+
+long y;
+int z;
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.76.0/tests/expected/cpp/31664-var_def_blks.cpp
new file mode 100644
index 00000000..c54e1c94
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31664-var_def_blks.cpp
@@ -0,0 +1,55 @@
+unsigned a;
+char b;
+
+
+
+
+int bar(void);
+unsigned c;
+char d;
+
+
+
+
+int foo(void) {
+	char buf[1000] = {0};
+	size_t len;
+	float amount;
+	double remainder;
+	bar();
+	uint64_t quux;
+	uint64_t quack;
+
+
+
+
+	for (int i = 0; i < 1000; i++) {
+		uint64_t checksum;
+		double remainder;
+
+
+
+
+		buf[i] += len;
+		uint32_t xyzzy;
+		uint32_t quark;
+	}
+	float amount;
+	double remainder;
+
+
+
+
+	baz();
+	uint32_t llama;
+	uint32_t treehouse;
+}
+char * w;
+uint8_t x;
+
+
+
+
+int baz(void);
+long y;
+int z;
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.76.0/tests/expected/cpp/31665-var_def_blks.cpp
new file mode 100644
index 00000000..e328c1db
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31665-var_def_blks.cpp
@@ -0,0 +1,46 @@
+unsigned a;
+char b;
+int bar(void);
+
+
+unsigned c;
+char d;
+int foo(void) {
+	char buf[1000] = {0};
+	size_t len;
+	float amount;
+	double remainder;
+
+	bar();
+
+
+	uint64_t quux;
+	uint64_t quack;
+	for (int i = 0; i < 1000; i++) {
+		uint64_t checksum;
+		double remainder;
+		buf[i] += len;
+
+
+		uint32_t xyzzy;
+		uint32_t quark;
+	}
+
+
+	float amount;
+	double remainder;
+	baz();
+
+
+	uint32_t llama;
+	uint32_t treehouse;
+}
+
+
+char * w;
+uint8_t x;
+int baz(void);
+
+
+long y;
+int z;
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.76.0/tests/expected/cpp/31666-var_def_blks.cpp
new file mode 100644
index 00000000..87f45a37
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31666-var_def_blks.cpp
@@ -0,0 +1,56 @@
+unsigned a;
+char b;
+
+
+
+
+int bar(void);
+unsigned c;
+char d;
+
+
+
+
+int foo(void) {
+	char buf[1000] = {0};
+	size_t len;
+	float amount;
+	double remainder;
+
+	bar();
+	uint64_t quux;
+	uint64_t quack;
+
+
+
+
+	for (int i = 0; i < 1000; i++) {
+		uint64_t checksum;
+		double remainder;
+
+
+
+
+		buf[i] += len;
+		uint32_t xyzzy;
+		uint32_t quark;
+	}
+	float amount;
+	double remainder;
+
+
+
+
+	baz();
+	uint32_t llama;
+	uint32_t treehouse;
+}
+char * w;
+uint8_t x;
+
+
+
+
+int baz(void);
+long y;
+int z;
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.76.0/tests/expected/cpp/31667-var_def_blks.cpp
new file mode 100644
index 00000000..e1652f4a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31667-var_def_blks.cpp
@@ -0,0 +1,69 @@
+unsigned a;
+char b;
+
+
+
+
+int bar(void);
+
+
+unsigned c;
+char d;
+
+
+
+
+int foo(void) {
+	char buf[1000] = {0};
+	size_t len;
+	float amount;
+	double remainder;
+	bar();
+
+
+	uint64_t quux;
+	uint64_t quack;
+
+
+
+
+	for (int i = 0; i < 1000; i++) {
+		uint64_t checksum;
+		double remainder;
+
+
+
+
+		buf[i] += len;
+
+
+		uint32_t xyzzy;
+		uint32_t quark;
+	}
+
+
+	float amount;
+	double remainder;
+
+
+
+
+	baz();
+
+
+	uint32_t llama;
+	uint32_t treehouse;
+}
+
+
+char * w;
+uint8_t x;
+
+
+
+
+int baz(void);
+
+
+long y;
+int z;
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.76.0/tests/expected/cpp/31668-var_def_blks.cpp
new file mode 100644
index 00000000..d660b2c2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31668-var_def_blks.cpp
@@ -0,0 +1,70 @@
+unsigned a;
+char b;
+
+
+
+
+int bar(void);
+
+
+unsigned c;
+char d;
+
+
+
+
+int foo(void) {
+	char buf[1000] = {0};
+	size_t len;
+	float amount;
+	double remainder;
+
+	bar();
+
+
+	uint64_t quux;
+	uint64_t quack;
+
+
+
+
+	for (int i = 0; i < 1000; i++) {
+		uint64_t checksum;
+		double remainder;
+
+
+
+
+		buf[i] += len;
+
+
+		uint32_t xyzzy;
+		uint32_t quark;
+	}
+
+
+	float amount;
+	double remainder;
+
+
+
+
+	baz();
+
+
+	uint32_t llama;
+	uint32_t treehouse;
+}
+
+
+char * w;
+uint8_t x;
+
+
+
+
+int baz(void);
+
+
+long y;
+int z;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
index 03615082..03615082 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
index f67cb76b..f67cb76b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
index adf1b8be..adf1b8be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
index e806e89e..e806e89e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
index 56f16799..56f16799 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31720-bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31720-bit-colon.cpp
index b8e7c4db..b8e7c4db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31720-bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31720-bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31721-Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31721-Issue_2689.cpp
index e2b43674..e2b43674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31721-Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31721-Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31730-ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31730-ms-style-ref.cpp
index 826d4e90..826d4e90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31730-ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31730-ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31740-I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31740-I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31740-I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31740-I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
index 99d403ef..99d403ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32001-issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32001-issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32001-issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32001-issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32002-proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32002-proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32002-proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32002-proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32003-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32003-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32003-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32003-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32004-issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32004-issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32004-issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32004-issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32005-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32005-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32005-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32005-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32006-bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32006-bug_i_687.cpp
index 387eaa06..387eaa06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32006-bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32006-bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32007-Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32007-Issue_3052.cpp
index cb468be3..cb468be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32007-Issue_3052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32007-Issue_3052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32008-Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32008-Issue_3034.cpp
index 1a110ee8..1a110ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32008-Issue_3034.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32008-Issue_3034.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32009-Issue_3422.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32009-Issue_3422.cpp
index 66e5ddad..66e5ddad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32009-Issue_3422.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32009-Issue_3422.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32010-Issue_3422.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32010-Issue_3422.cpp
index 7077eb71..7077eb71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32010-Issue_3422.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32010-Issue_3422.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32100-cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32100-cpp17.cpp
index cfccba03..cfccba03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32100-cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32100-cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32105-I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32105-I2103.cpp
index c35fbe56..c35fbe56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32105-I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32105-I2103.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32115-2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32115-2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32115-2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32115-2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33000-tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33000-tab-0.cpp
index d9ff0418..d9ff0418 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33000-tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33000-tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33001-tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33001-tab-1.cpp
index 85d8abe2..85d8abe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33001-tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33001-tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
index db09e6fc..db09e6fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33004-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33004-DoxygenComments.cpp
index df0b9680..df0b9680 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33004-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33004-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33005-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33005-DoxygenComments.cpp
index 533214f2..533214f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33005-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33005-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33007-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33007-NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33007-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33007-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33008-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33008-NewLine.cpp
index b3cc1bed..b3cc1bed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33008-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33008-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33009-NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33009-NewLine0.cpp
index b5a714fa..b5a714fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33009-NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33009-NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33010-Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33010-Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33010-Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33010-Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33011-static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33011-static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33011-static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33011-static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
index faf00903..faf00903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33013-Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33013-Q_2.cpp
index 7d0bb88a..7d0bb88a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33013-Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33013-Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33014-DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33014-DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33014-DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33014-DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33015-Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33015-Q_FOREACH.cpp
index 02fd849d..02fd849d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33015-Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33015-Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33016-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33016-indent.cpp
index 22d04a78..22d04a78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33016-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33016-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33017-bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33017-bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33017-bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33017-bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33019-bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33019-bug_657.cpp
index 3b5bb42a..3b5bb42a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33019-bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33019-bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33020-bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33020-bug_662.cpp
index 48b612ae..48b612ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33020-bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33020-bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33021-bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33021-bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33021-bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33021-bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33022-bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33022-bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33022-bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33022-bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33023-bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33023-bug_651.cpp
index f0236016..f0236016 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33023-bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33023-bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33024-bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33024-bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33024-bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33024-bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33025-bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33025-bug_654.cpp
index 497e3372..497e3372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33025-bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33025-bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33026-bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33026-bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33026-bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33026-bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33027-bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33027-bug_664.cpp
index 6fa5beea..6fa5beea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33027-bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33027-bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33028-braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33028-braces_empty.cpp
index 8e46ab7c..8e46ab7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33028-braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33028-braces_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33029-cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33029-cast.cpp
index 67e725ff..67e725ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33029-cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33029-cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33030-Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33030-Q_FOREVER.cpp
index 5dad4fa9..5dad4fa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33030-Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33030-Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33031-bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33031-bug_612.cpp
index 4388ac75..4388ac75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33031-bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33031-bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33032-bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33032-bug_670.cpp
index 0ede02f2..0ede02f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33032-bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33032-bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33033-bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33033-bug_670.h
index cc6d46e3..cc6d46e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33033-bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33033-bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33034-bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33034-bug_671.h
index 5ef3b5d9..5ef3b5d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33034-bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33034-bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33035-patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33035-patch_32.cpp
index 8b414f00..8b414f00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33035-patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33035-patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33036-bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33036-bug_663.cpp
index 7583d548..7583d548 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33036-bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33036-bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33037-func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33037-func_class.cpp
index ea271c11..ea271c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33037-func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33037-func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33038-func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33038-func_class.h
index 8b3ca218..8b3ca218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33038-func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33038-func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
index 707c1c38..707c1c38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33040-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33040-bug_i_411.cpp
index 5a3f09aa..5a3f09aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33040-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33040-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33041-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33041-bug_i_411.cpp
index 4e89d68d..4e89d68d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33041-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33041-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33042-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33042-bug_i_411.cpp
index 574f12ba..574f12ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33042-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33042-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33043-bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33043-bug_i_478.cpp
index 868220bb..868220bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33043-bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33043-bug_i_478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33044-bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33044-bug_i_481.cpp
index e8470648..e8470648 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33044-bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33044-bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33045-bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33045-bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33045-bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33045-bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33046-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33046-bug_i_409.cpp
index 6946a562..6946a562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33046-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33046-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33047-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33047-bug_i_409.cpp
index 7bfdfd83..7bfdfd83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33047-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33047-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33048-bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33048-bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33048-bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33048-bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33049-pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33049-pp-pragma.cpp
index 2c013b08..2c013b08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33049-pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33049-pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33050-issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33050-issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33050-issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33050-issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33051-bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33051-bug_i_503.cpp
index 31ca41a8..31ca41a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33051-bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33051-bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33052-bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33052-bug_i_512.cpp
index 9b93cdf2..9b93cdf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33052-bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33052-bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33053-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33053-for_auto.cpp
index 073556c9..073556c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33053-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33053-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33054-bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33054-bug_i_825.cpp
index 242c4811..242c4811 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33054-bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33054-bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33056-bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33056-bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33056-bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33056-bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33057-bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33057-bug_1349.cpp
index fcc2e567..fcc2e567 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33057-bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33057-bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33058-Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33058-Issue_3164.cpp
index a1e426b0..a1e426b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33058-Issue_3164.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33058-Issue_3164.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33060-if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33060-if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33060-if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33060-if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33061-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33061-if_chain_braces.cpp
index 693efc63..693efc63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33061-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33061-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33062-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33062-if_chain_braces.cpp
index af36ed0e..af36ed0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33062-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33062-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33063-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33063-if_chain_braces.cpp
index 00038700..00038700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33063-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33063-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33064-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33064-if_chain_braces.cpp
index c42ef73a..c42ef73a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33064-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33064-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33065-Issue_3316.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33065-Issue_3316.cpp
index 91ec82f0..91ec82f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33065-Issue_3316.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33065-Issue_3316.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33066-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33066-if_chain_braces.cpp
index 0ef6478b..0ef6478b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33066-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33066-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33067-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33067-if_chain_braces.cpp
index 7df1c6e8..7df1c6e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33067-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33067-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33069-Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33069-Issue_2195.cpp
index fe3ec459..fe3ec459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33069-Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33069-Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33070-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33070-multi_line.cpp
index dcea4c00..dcea4c00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33070-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33070-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33071-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33071-multi_line.cpp
index 0f8503fc..0f8503fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33071-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33071-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33072-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33072-multi_line.cpp
index add93503..add93503 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33072-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33072-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33073-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33073-multi_line.cpp
index c0016ff6..c0016ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33073-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33073-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33074-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33074-multi_line.cpp
index c8f32960..c8f32960 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33074-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33074-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33075-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33075-multi_line.cpp
index 66963f4e..66963f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33075-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33075-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33076-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33076-multi_line.cpp
index 9d105267..9d105267 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33076-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33076-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33077-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33077-multi_line.cpp
index d7cbafc8..d7cbafc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33077-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33077-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33078-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33078-multi_line.cpp
index 01fe4d10..01fe4d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33078-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33078-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33079-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33079-multi_line.cpp
index 6a6490ab..6a6490ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33079-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33079-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33080-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33080-multi_line.cpp
index 8f44ce91..8f44ce91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33080-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33080-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33081-bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33081-bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33081-bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33081-bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33082-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33082-namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33082-namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33082-namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33083-bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33083-bug_i_359.cpp
index 8081c1f9..8081c1f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33083-bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33083-bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33084-op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33084-op_sym_empty.cpp
index 3557e513..3557e513 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33084-op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33084-op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33085-bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33085-bug_i_323.cpp
index 6f622f6e..6f622f6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33085-bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33085-bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33086-bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33086-bug_i_568.cpp
index 2e1a00d7..55da09f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33086-bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33086-bug_i_568.cpp
@@ -1,4 +1,4 @@
-enum { // Keep this line as it is. It's a regression test for checking pc->prev->prev-> on CT_BRACE_OPEN.
+enum { // Keep this line as it is. It's a regression test for checking pc->GetPrev()->GetPrev()-> on CT_BRACE_OPEN.
 	kEnumValue =5,
 };
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33087-bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33087-bug_i_596.cpp
index db3644a2..db3644a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33087-bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33087-bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33088-bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33088-bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33088-bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33088-bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33089-bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33089-bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33089-bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33089-bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33090-gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33090-gh555.cpp
index 32147190..32147190 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33090-gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33090-gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33091-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
index 7311c71e..7311c71e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33092-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
index 94b20d2e..94b20d2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33093-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33093-sp_angle_paren.cpp
index 7ed4f34e..7ed4f34e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33093-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33093-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33094-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33094-sp_angle_paren.cpp
index c20305c3..c20305c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33094-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33094-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33095-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33095-bug_i_322.cpp
index 3904ec27..3904ec27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33095-bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33095-bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33096-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
index df3d90ab..df3d90ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33097-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33097-enum_comma.h
index bb93f4a9..bb93f4a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33097-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33097-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33098-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33098-enum_comma.h
index 3ec29719..3ec29719 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33098-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33098-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33099-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33099-enum_comma.h
index 01a89059..01a89059 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33099-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33099-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33100-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33100-enum_comma.h
index 903a6849..903a6849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33100-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33100-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33101-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33101-enum_comma.h
index 53c1a99e..53c1a99e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33101-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33101-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33102-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33102-enum_comma.h
index 6c11f2b3..6c11f2b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33102-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33102-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33103-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33103-bug_858.cpp
index 1085f7db..1085f7db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33103-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33103-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33104-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33104-bug_858.cpp
index c5ac560e..c5ac560e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33104-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33104-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33105-bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33105-bug_1001.cpp
index d6104cd5..d6104cd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33105-bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33105-bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33106-pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33106-pos_bool_in_template.h
index f5fdb04e..f5fdb04e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33106-pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33106-pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33107-Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33107-Issue_2688.cpp
index ac97ff3a..ac97ff3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33107-Issue_2688.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33107-Issue_2688.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33108-Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33108-Issue_2045.cpp
index a1670ffc..a1670ffc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33108-Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33108-Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33109-Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33109-Issue_3205.cpp
index 99767289..99767289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33109-Issue_3205.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33109-Issue_3205.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33110-enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33110-enum.cpp
index a0ab57c8..b4f7df56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33110-enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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, /* set_chunk_parent() */
-   LSETTYP   = 92, /* set_chunk_type() */
+   LSETPAR   = 91, /* Chunk::SetParentTypeReal() */
+   LSETTYP   = 92, /* Chunk::SetTypeReal() */
    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.75.0/tests/expected/cpp/33120-Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33120-Issue_2149.cpp
index 1266bd7b..1266bd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33120-Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33120-Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33150-bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33150-bug_i_753.cpp
index 9aa764a4..9aa764a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33150-bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33150-bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33151-bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33151-bug_i_752.cpp
index da8fe9f5..da8fe9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33151-bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33151-bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33152-bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33152-bug_1004.cpp
index f072a583..f072a583 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33152-bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33152-bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33160-bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33160-bug_1112.cpp
index da95fcb6..da95fcb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33160-bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33160-bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33161-byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33161-byref-3.cpp
index 8c51bf46..8c51bf46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33161-byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33161-byref-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33162-sp_not_not.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33162-sp_not_not.cpp
index 42306dad..42306dad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33162-sp_not_not.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33162-sp_not_not.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33180-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33180-pp_multi_comment.cpp
index bfe1e1d1..bfe1e1d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33180-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33180-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33181-Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33181-Issue_2759.cpp
index cbe9c4a5..cbe9c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33181-Issue_2759.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33181-Issue_2759.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33182-Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33182-Issue_2794.cpp
index 16de515b..16de515b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33182-Issue_2794.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33182-Issue_2794.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33200-first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33200-first_len_minimum.cpp
index c33d9e03..c33d9e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33200-first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33200-first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
index 3b1bea1c..3b1bea1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33202-initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
index a3bc4a2a..a3bc4a2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33203-Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33203-Issue_2574.cpp
index bd88347d..bd88347d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33203-Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33203-Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33204-Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33204-Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33204-Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33204-Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33205-Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33205-Issue_3198.cpp
index 8dd234b7..8dd234b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33205-Issue_3198.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33205-Issue_3198.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33210-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33210-templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33210-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33210-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33211-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33211-pp_multi_comment.cpp
index 5690e3a6..5690e3a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33211-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33211-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33212-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33212-pp-define-indent.cpp
index 78dc4c98..78dc4c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33212-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33212-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33213-disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33213-disable_macro.cpp
index 7e64f416..7e64f416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33213-disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33213-disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33214-Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33214-Issue_2742.cpp
index 66d12fec..66d12fec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33214-Issue_2742.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33214-Issue_2742.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33215-Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33215-Issue_3055.cpp
index d23a0d56..d23a0d56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33215-Issue_3055.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33215-Issue_3055.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33216-Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33216-Issue_3055-a.cpp
index 21a5c35c..21a5c35c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33216-Issue_3055-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33216-Issue_3055-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33217-Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33217-Issue_3113.cpp
index 63090f4a..63090f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33217-Issue_3113.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33217-Issue_3113.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34001-nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34001-nl_before_after.h
index 8cdc7273..8cdc7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34001-nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34001-nl_before_after.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34002-bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34002-bug_i_793.cpp
index b6b6a7ab..b6b6a7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34002-bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34002-bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
index cd1083ee..cd1083ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
index c2f8dc36..c2f8dc36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
index 738f3bf6..738f3bf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34006-bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34006-bug_i_575.cpp
index 4c25fb75..4c25fb75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34006-bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34006-bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34007-bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34007-bug_i_928.cpp
index 78b214bd..78b214bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34007-bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34007-bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34100-bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34100-bug_i_525.cpp
index b810afe0..b810afe0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34100-bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34100-bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34101-bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34101-bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34101-bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34101-bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34105-bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34105-bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34105-bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34105-bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34108-bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34108-bug_i_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34108-bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34108-bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34112-bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34112-bug_i_889.cpp
index 5b803a0e..5b803a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34112-bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34112-bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34113-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34113-bug_902.cpp
index ada480c0..ada480c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34113-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34113-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34114-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34114-bug_902.cpp
index af6bdb44..af6bdb44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34114-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34114-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
index ff76cb2b..ff76cb2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34116-issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34116-issue_2000.cpp
index f4f2c2bf..f4f2c2bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34116-issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34116-issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34117-extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34117-extern_func.cpp
index 4de29e3c..4de29e3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34117-extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34117-extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34118-Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34118-Issue_2163.cpp
index afd04eb0..afd04eb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34118-Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34118-Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34120-bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34120-bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34120-bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34120-bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34121-bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34121-bug_1717.cpp
index 4116871f..4116871f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34121-bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34121-bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34122-Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34122-Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34122-Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34122-Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34123-Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34130-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34130-bug_i_1000.cpp
index 6e1e7a0e..6e1e7a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34130-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34130-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34131-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34131-bug_i_1000.cpp
index 149353e7..149353e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34131-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34131-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34132-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34132-new_op.cpp
index 15386247..15386247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34132-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34132-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34133-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34133-new_op.cpp
index ce690c94..ce690c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34133-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34133-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34134-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34134-new_op.cpp
index 67dfa187..67dfa187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34134-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34134-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34135-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34135-new_op.cpp
index 044cd859..044cd859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34135-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34135-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
index 0a6635d0..0a6635d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34140-bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34140-bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34140-bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34140-bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34141-bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34141-bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34141-bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34141-bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34142-I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34142-I1112-1.cpp
index df27d1d6..df27d1d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34142-I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34142-I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34143-I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34143-I1112-2.cpp
index 28a4489d..28a4489d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34143-I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34143-I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34144-I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34144-I1112-3.cpp
index c95a6c40..c95a6c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34144-I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34144-I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34145-i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34145-i683.cpp
index 255c6336..255c6336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34145-i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34145-i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34146-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34146-bug_1002.cpp
index 0d72c80a..0d72c80a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34146-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34146-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34147-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34147-bug_1002.cpp
index 02b85396..02b85396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34147-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/34148-bug_1139.cpp
new file mode 100644
index 00000000..11a11a77
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34148-bug_1139.cpp
@@ -0,0 +1,42 @@
+void a()
+{
+	if((tmp == nullptr) ||
+	   ((tmp->GetType() != CT_NUMBER) &&
+	    (tmp->GetType() != CT_SIZEOF) &&
+	    !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	   (tmp->GetType() == CT_NEWLINE)
+	   )
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+	else if ((tmp == nullptr) ||
+	         ((tmp->GetType() != CT_NUMBER) &&
+	          (tmp->GetType() != CT_SIZEOF) &&
+	          !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	         (tmp->GetType() == CT_NEWLINE)
+	         )
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+
+
+	if                 ((tmp == nullptr) ||
+	                    ((tmp->GetType() != CT_NUMBER) &&
+	                     (tmp->GetType() != CT_SIZEOF) &&
+	                     !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	                    (tmp->GetType() == CT_NEWLINE)
+	                    )
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+
+	if                 ((tmp == nullptr) ||
+	                    ((tmp->GetType() != CT_NUMBER) &&
+	                     (tmp->GetType() != CT_SIZEOF) &&
+	                     !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	                    (tmp->GetType() == CT_NEWLINE)
+	                    )
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+}
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.76.0/tests/expected/cpp/34149-bug_1139.cpp
new file mode 100644
index 00000000..88243de7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34149-bug_1139.cpp
@@ -0,0 +1,38 @@
+void a()
+{
+	if((tmp == nullptr) ||
+	   ((tmp->GetType() != CT_NUMBER) &&
+	    (tmp->GetType() != CT_SIZEOF) &&
+	    !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	   (tmp->GetType() == CT_NEWLINE))
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+	else if ((tmp == nullptr) ||
+	         ((tmp->GetType() != CT_NUMBER) &&
+	          (tmp->GetType() != CT_SIZEOF) &&
+	          !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	         (tmp->GetType() == CT_NEWLINE))
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+
+
+	if                 ((tmp == nullptr) ||
+	                    ((tmp->GetType() != CT_NUMBER) &&
+	                     (tmp->GetType() != CT_SIZEOF) &&
+	                     !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	                    (tmp->GetType() == CT_NEWLINE))
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+
+	if                 ((tmp == nullptr) ||
+	                    ((tmp->GetType() != CT_NUMBER) &&
+	                     (tmp->GetType() != CT_SIZEOF) &&
+	                     !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+	                    (tmp->GetType() == CT_NEWLINE))
+	{
+		next->SetType(CT_LABEL_COLON);
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34150-bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34150-bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34150-bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34150-bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34151-bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34151-bug_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34151-bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34151-bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34152-bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34152-bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34152-bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34152-bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34153-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
index 356a7713..356a7713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34154-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
index adc09173..adc09173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34155-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
index 7d62eafb..7d62eafb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34156-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
index 6519b4b1..6519b4b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34157-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
index 6751c0fa..6751c0fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34158-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
index d5dcfdeb..d5dcfdeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34159-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
index 0b9bf31c..0b9bf31c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34160-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
index 01c89132..01c89132 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34161-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34162-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
index 2d5dc62c..2d5dc62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34163-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
index 9be7507a..9be7507a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34164-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
index 68565614..68565614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34165-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
index 92fc0b0b..92fc0b0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34166-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
index d7dfa908..d7dfa908 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34168-Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34168-Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34168-Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34168-Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34169-init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34169-init-list-call.cpp
index 95449eb1..95449eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34169-init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34169-init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34170-i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34170-i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34170-i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34170-i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34171-i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34171-i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34171-i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34171-i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34172-i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34172-i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34172-i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34172-i1165.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34173-i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34173-i1464.cpp
index 179ecd5e..179ecd5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34173-i1464.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34173-i1464.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34174-i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34174-i1466.cpp
index fe704d2a..fe704d2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34174-i1466.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34174-i1466.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34175-i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34175-i1509.cpp
index 419807fd..419807fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34175-i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34175-i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
index b9a75cf6..b9a75cf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34177-sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
index 580e9bae..580e9bae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34178-Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34178-Issue_3237.cpp
index 23b565a9..23b565a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34178-Issue_3237.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34178-Issue_3237.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34179-arith_vs_byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34179-arith_vs_byref.cpp
index f459fdcc..f459fdcc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34179-arith_vs_byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34179-arith_vs_byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34180-bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34180-bug_1402.cpp
index 09714c41..09714c41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34180-bug_1402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34180-bug_1402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34190-bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34190-bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34190-bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34190-bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34191-comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34191-comment-align-multiline.cpp
index db501481..db501481 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34191-comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34191-comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34192-i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34192-i1207.cpp
index e02da8c9..e02da8c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34192-i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34192-i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34193-i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34193-i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34193-i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34193-i1218.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34194-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34194-sp_arith_additive.cpp
index 5ecb2ec8..5ecb2ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34194-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34194-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34195-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34195-sp_arith_additive.cpp
index f419a3ed..f419a3ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34195-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34195-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34196-Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34196-Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34196-Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34196-Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34197-bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34197-bug_1161.cpp
index 34740f5a..34740f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34197-bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34197-bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34198-bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34198-bug_1249.cpp
index 65637efe..65637efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34198-bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34198-bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34199-not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34199-not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34199-not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34199-not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34200-i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34200-i1536.cpp
index 0eb7fc69..0eb7fc69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34200-i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34200-i1536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34201-i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34201-i1565.cpp
index d0bef508..c787f163 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34201-i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34201-i1565.cpp
@@ -2,8 +2,8 @@ namespace ns1 {
 namespace ns2 {
 
   #define SOME_MACRO() \
-	if(true) { \
-	}
+	  if(true) { \
+	  }
 
 } // namespace ns2
 } // namespace ns1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34202-i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34202-i1617.cpp
index 98ede13b..98ede13b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34202-i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34202-i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34203-i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34203-i1516.cpp
index d0612a2b..d0612a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34203-i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34203-i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
index e8790dbd..e8790dbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34205-bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34205-bug_1395.cpp
index 16e2fbba..16e2fbba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34205-bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34205-bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34206-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34206-for_loop_head.cpp
index 6cea550d..6cea550d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34206-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34206-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34207-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34207-for_loop_head.cpp
index 2aa9bdc0..2aa9bdc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34207-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34207-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34208-conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34208-conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34208-conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34208-conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34209-lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
index 8f0c819e..8f0c819e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34210-override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34210-override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34210-override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34210-override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34211-anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34211-anonymous_enum.cpp
index ef237a6e..ef237a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34211-anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/34212-func_class.h
new file mode 100644
index 00000000..2035b634
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34212-func_class.h
@@ -0,0 +1,16 @@
+void MD5::reverse_u32(UINT8 *buf, int n_u32);
+
+MD5::MD5();
+
+class AlignStack
+{
+public:
+bool m_skip_first;
+
+AlignStack();
+
+
+~AlignStack();
+
+void End();
+}; // class AlignStack
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34250-bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34250-bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34250-bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34250-bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34251-bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34251-bug_1649.cpp
index 4b352c79..4b352c79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34251-bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34251-bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34252-issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34252-issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34252-issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34252-issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34253-friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34253-friends.cpp
index 58fd649a..58fd649a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34253-friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34253-friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34254-issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34254-issue_1985.cpp
index ef9fc90a..ef9fc90a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34254-issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34254-issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
index 7005d86c..7005d86c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34256-Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34256-Issue_2836.cpp
index 4d2a648f..4d2a648f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34256-Issue_2836.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/34257-brace_init_stdint_macros.cpp
new file mode 100644
index 00000000..976eb454
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34257-brace_init_stdint_macros.cpp
@@ -0,0 +1,11 @@
+#include <stdint.h>
+
+uint64_t values[12] = {
+	UINT64_C(1486918591), UINT64_C(28100), ~UINT64_C(4),
+	UINT64_C(0x2700f184), UINT64_C(0x69b88dcc4d7e98eb),
+	UINT64_C(0x0ab8e2a231b49732),
+	UINT64_C(0x8226beae36e7317e), UINT64_C(0x5739289992c21658),
+	UINT64_C(0x3acce043), ~UINT64_C(8), UINT64_C(4022),
+	UINT64_C(63365009),
+};
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34280-UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34280-UNI-29935.cpp
index 28d0b66d..28d0b66d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34280-UNI-29935.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34280-UNI-29935.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
index 19c4b962..19c4b962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
index aed91c1b..aed91c1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
index cc0ac847..cc0ac847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
index c47119ab..c47119ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
index afe3a0ec..afe3a0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
index 9b8ea3c5..9b8ea3c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34296-i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34296-i1768.cpp
index 94327d9c..94327d9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34296-i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34296-i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34297-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34297-align-assign-mixed.cpp
index d8082600..d8082600 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34297-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34297-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34298-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34298-align-assign-mixed.cpp
index 4f8dadde..4f8dadde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34298-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34298-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34299-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34299-align-assign-mixed.cpp
index ddae789b..ddae789b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34299-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34299-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34300-bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34300-bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34300-bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34300-bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
index 05aaf7c8..05aaf7c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
index 8a35c775..8a35c775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
index e498a669..e498a669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
index 078e070a..078e070a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34305-issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34305-issue_2124-1.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34305-issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34305-issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34306-issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34306-issue_2124-2.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34306-issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34306-issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34307-2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34307-2203.cpp
index 70a1f31a..70a1f31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34307-2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34307-2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34308-enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34309-issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34309-issue_2209-1.cpp
index 82ff67c6..82ff67c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34309-issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34309-issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34310-issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34310-issue_2209-2.cpp
index 26c579d3..26c579d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34310-issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34310-issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34311-Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34311-Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34311-Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34311-Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34312-Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34312-Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34312-Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34312-Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34313-Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34313-Issue_2437.cpp
index 77a273ef..77a273ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34313-Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34313-Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34314-Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34314-Issue_2604.cpp
index eb87fc8a..eb87fc8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34314-Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34314-Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
index c4f1a119..c4f1a119 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
index 1bbde49b..1bbde49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
index e0d3488a..e0d3488a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34318-align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
index 1c003058..1c003058 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
index 8a9df8b4..8a9df8b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
index 432a9e3e..432a9e3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34321-bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34321-bug_2285.cpp
index a456e9be..a456e9be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34321-bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34321-bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34322-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34322-issue_2623.cpp
index a9566447..a9566447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34322-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34322-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34323-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34323-issue_2623.cpp
index 72fd90e8..72fd90e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34323-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34323-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34324-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34324-issue_2623.cpp
index 61961fa1..61961fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34324-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34324-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34325-Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34325-Issue_3025.cpp
index 9e64526e..9e64526e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34325-Issue_3025.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34325-Issue_3025.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34326-Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34326-Issue_3040.cpp
index f9e69333..f9e69333 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34326-Issue_3040.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34326-Issue_3040.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34327-Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34327-Issue_3044.cpp
index 799fd0a1..799fd0a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34327-Issue_3044.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34327-Issue_3044.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34328-Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34328-Issue_3048.cpp
index fb6b0d38..fb6b0d38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34328-Issue_3048.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34328-Issue_3048.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
index d46f2655..d46f2655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
index d46f2655..d46f2655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
index d46f2655..d46f2655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
index ef73253e..ef73253e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
index ef73253e..ef73253e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
index ef73253e..ef73253e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
index c228ce46..c228ce46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
index c228ce46..c228ce46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
index c228ce46..c228ce46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
index 7188f0d0..7188f0d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
index 7188f0d0..7188f0d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
index 7188f0d0..7188f0d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
index 0e475aa4..0e475aa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
index 59b5b996..59b5b996 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
index 032a0dfc..032a0dfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
index 02ce38f1..02ce38f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/34370-asm_block_pp.cpp
new file mode 100644
index 00000000..e8fc87a6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34370-asm_block_pp.cpp
@@ -0,0 +1,20 @@
+
+void add128( uint64_t & rlo, uint64_t & rhi, uint64_t addlo ) {
+#if defined(HAVE_X86_64_ASM)
+	__asm__ ("addq %2, %0\n"
+                 "adcq $0, %1\n"
+#if defined(__clang__)
+	           // clang cannot work properly with "g" and silently
+	           // produces hardly-workging code, if "g" is specified;
+                 : "+r" (rlo), "+r" (rhi)
+                 : "m" (addlo)
+#else
+                 : "+g" (rlo), "+g" (rhi)
+                 : "g" (addlo)
+#endif
+        );
+#else
+	rlo += addlo;
+	rhi += (rlo < addlo);
+#endif
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34500-sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
index 54507d64..54507d64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34501-sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
index 9e5b2db8..9e5b2db8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34502-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34502-sp_enum_assign.cpp
index 62a271a3..62a271a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34502-sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34502-sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34503-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34503-sp_enum_assign.cpp
index 2ebab438..2ebab438 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34503-sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34503-sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34504-issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34504-issue_574-i.cpp
index 3366cc79..3366cc79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34504-issue_574-i.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34504-issue_574-i.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34505-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34505-Issue_3220.cpp
index fae042d7..fae042d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34505-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34505-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34506-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34506-Issue_3220.cpp
index ba42b013..ba42b013 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34506-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34506-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34507-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34507-Issue_3220.cpp
index f9f684b8..f9f684b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34507-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34507-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34508-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34508-Issue_3220.cpp
index aba03416..aba03416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34508-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34508-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34509-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34509-byref-2.cpp
index ab1b3a6e..ab1b3a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34509-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34509-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34510-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34510-byref-2.cpp
index 0ef61cde..0ef61cde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34510-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34510-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34511-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34511-byref-2.cpp
index db510335..db510335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34511-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34511-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34512-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34512-byref-2.cpp
index 099e3c2b..099e3c2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34512-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34512-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34513-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34513-sp_cond_question.cpp
index 5f5a9e14..5f5a9e14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34513-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34513-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34514-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34514-sp_cond_question.cpp
index cec6c827..cec6c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34514-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34514-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34515-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34515-sp_cond_question.cpp
index 39997b4a..39997b4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34515-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34515-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34516-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34516-sp_cond_question.cpp
index c7d79ab9..c7d79ab9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34516-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34516-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34517-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34517-semi.cpp
index 6c42948f..6c42948f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34517-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34517-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34518-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34518-semi.cpp
index 7c8a711e..7c8a711e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34518-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34518-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34519-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34519-semi.cpp
index 56af135e..56af135e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34519-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34519-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34520-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34520-comma.cpp
index e9b0c428..e9b0c428 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34520-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34520-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34521-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34521-comma.cpp
index e101145a..e101145a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34521-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34521-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34522-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34522-comma.cpp
index bc8ebd4f..bc8ebd4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34522-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34522-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
index 1b0b4088..1b0b4088 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34524-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34524-bug_1002.cpp
index 713018e4..713018e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34524-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34524-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34525-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34525-sp_paren_brace.cpp
index febfb72d..febfb72d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34525-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34525-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34526-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34526-sp_paren_brace.cpp
index 4ac73f87..4ac73f87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34526-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34526-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34527-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34527-sp_paren_brace.cpp
index aa65f644..aa65f644 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34527-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34527-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
index 946409b2..946409b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34529-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34530-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
index b99238b8..b99238b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34531-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34532-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
index 53e74de2..53e74de2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34533-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34533-templates.cpp
index 5f3d6f90..5f3d6f90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34533-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34533-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34534-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34534-templates.cpp
index 9e3f463d..9e3f463d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34534-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34534-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34535-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34535-sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34535-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34535-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34536-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34536-sp_after_angle.cpp
index 8764578e..8764578e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34536-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34536-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34540-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34540-byref-4.cpp
index 0fe49c7b..0fe49c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34540-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34540-byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34541-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34541-byref-4.cpp
index 779da86b..779da86b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34541-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34541-byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34542-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34542-byref-4.cpp
index 16a7ba9b..16a7ba9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34542-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34542-byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34543-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34543-byref-4.cpp
index 6bd2e9be..6bd2e9be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34543-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/34550-throws.cpp
new file mode 100644
index 00000000..f4e781fb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34550-throws.cpp
@@ -0,0 +1,17 @@
+int main()
+{
+	throw("error");
+
+	throw  ("error");
+
+	throw"error";
+
+	throw "error";
+
+	throw
+	        "error";
+
+	throw
+
+	        "error";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34551-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34551-throws.cpp
new file mode 100644
index 00000000..2a8c2ef0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34551-throws.cpp
@@ -0,0 +1,21 @@
+int main()
+{
+	throw
+	        ("error");
+
+	throw
+	        ("error");
+
+	throw
+	        "error";
+
+	throw
+	        "error";
+
+	throw
+	        "error";
+
+	throw
+
+	        "error";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34552-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34552-throws.cpp
new file mode 100644
index 00000000..cca784aa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34552-throws.cpp
@@ -0,0 +1,14 @@
+int main()
+{
+	throw("error");
+
+	throw  ("error");
+
+	throw"error";
+
+	throw "error";
+
+	throw"error";
+
+	throw"error";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34553-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34553-throws.cpp
new file mode 100644
index 00000000..f8a4cc04
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34553-throws.cpp
@@ -0,0 +1,20 @@
+int main()
+{
+	throw
+	        ("error");
+
+	throw
+	        ("error");
+
+	throw
+	        "error";
+
+	throw
+	        "error";
+
+	throw
+	        "error";
+
+	throw
+	        "error";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34554-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34554-throws.cpp
new file mode 100644
index 00000000..f4e781fb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34554-throws.cpp
@@ -0,0 +1,17 @@
+int main()
+{
+	throw("error");
+
+	throw  ("error");
+
+	throw"error";
+
+	throw "error";
+
+	throw
+	        "error";
+
+	throw
+
+	        "error";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34555-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34555-throws.cpp
new file mode 100644
index 00000000..26028e4d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34555-throws.cpp
@@ -0,0 +1,17 @@
+int main()
+{
+	throw("error");
+
+	throw  ("error");
+
+	throw("error");
+
+	throw("error");
+
+	throw
+	        ("error");
+
+	throw
+
+	        ("error");
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34556-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34556-throws.cpp
new file mode 100644
index 00000000..6449e658
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34556-throws.cpp
@@ -0,0 +1,17 @@
+int main()
+{
+	throw "error";
+
+	throw   "error";
+
+	throw"error";
+
+	throw "error";
+
+	throw
+	        "error";
+
+	throw
+
+	        "error";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34557-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34557-throws.cpp
new file mode 100644
index 00000000..26028e4d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34557-throws.cpp
@@ -0,0 +1,17 @@
+int main()
+{
+	throw("error");
+
+	throw  ("error");
+
+	throw("error");
+
+	throw("error");
+
+	throw
+	        ("error");
+
+	throw
+
+	        ("error");
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/39000-UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/39000-UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/39000-UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/39000-UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60001-UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60001-UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60001-UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60001-UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60002-UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60002-UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60002-UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60002-UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60003-UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60003-UNI-1288.cpp
index aece270a..aece270a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60003-UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60003-UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60006-UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60006-UNI-2049.cpp
index 7e47d927..7e47d927 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60006-UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60006-UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60017-UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60017-UNI-2683.cpp
index 734e3999..734e3999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60017-UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60017-UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60022-UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60022-UNI-18439.cpp
index 8d467c67..8d467c67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60022-UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60022-UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60025-UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60025-UNI-19894.cpp
index 2d7e481e..2d7e481e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60025-UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60025-UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60027-UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60027-UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60027-UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60027-UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60028-UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60028-UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60028-UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60028-UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60029-UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60029-UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60029-UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60029-UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60030-UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60030-UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60030-UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60030-UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60031-UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60031-UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60031-UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60031-UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60032-UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60032-UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60032-UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60032-UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60036-UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60036-UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60036-UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60036-UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60038-UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60038-UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60038-UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60038-UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60039-UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60039-UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60039-UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60039-UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60042-UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60042-UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60042-UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60042-UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60043-i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60043-i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60043-i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60043-i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60044-i2116.cpp
index af664cd9..af664cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60044-i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60044-i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
index 364b2a6b..364b2a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60047-align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60047-align_default_after_override.cpp
index 43db090f..43db090f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60047-align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60047-align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60048-bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60048-bug_2322.cpp
index 50454903..50454903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60048-bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60048-bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60049-bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60049-bug_2402.cpp
index e483fdc9..e483fdc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60049-bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60049-bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60051-bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60051-bug_2371.cpp
index f17cec62..f17cec62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60051-bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60051-bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60052-bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60052-bug_2433_1.cpp
index d011d5a1..d011d5a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60052-bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60052-bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60053-bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60053-bug_2433_2.cpp
index 600efc82..600efc82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60053-bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60053-bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
index ed92e698..ed92e698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60055-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60055-issue_3116.cpp
index 44ec3a5f..fcc38415 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60055-issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60055-issue_3116.cpp
@@ -129,8 +129,8 @@ A(
 // Inside scope
 {
     std::thread([](const char *c) {
-        std::cout << c << std::endl;
-    }).detach();
+            std::cout << c << std::endl;
+        }).detach();
 
     std::thread(
         [](const char *c) {
@@ -149,8 +149,8 @@ A(
 }
 
 Func(std::count_if(v.begin(), v.end(), [&](const auto &a) {
-    return a == 3;
-}));
+        return a == 3;
+    }));
 
 Func(
     std::count_if(v.begin(), v.end(), [&](const auto &a)
@@ -210,14 +210,14 @@ else
 
 // Test case from issue 1296 and some variants
 obj->Func([&](int a)
-{
-    return b;
-});
+    {
+        return b;
+    });
 
 obj->Func([] -> int
-{
-    return b;
-});
+    {
+        return b;
+    });
 
 obj->Func([]
     {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60056-issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60056-issue_3116-2.cpp
index dded453c..0ce38756 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60056-issue_3116-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60056-issue_3116-2.cpp
@@ -1,10 +1,10 @@
 obj.AddObject(Object::UniqueName(), 10, [this] {
-    holder.Access([this](const auto &info) {
-        if (IsGood(info)) {
-            Add(info);
-        }
+        holder.Access([this](const auto &info) {
+            if (IsGood(info)) {
+                Add(info);
+            }
+        });
     });
-});
 
 obj.AddObject(
     Object::UniqueName(),
@@ -20,12 +20,12 @@ obj.AddObject(
 
 {
     obj.AddObject(Object::UniqueName(), 10, [this] {
-        holder.Access([this](const auto &info) {
-            if (IsGood(info)) {
-                Add(info);
-            }
+            holder.Access([this](const auto &info) {
+                if (IsGood(info)) {
+                    Add(info);
+                }
+            });
         });
-    });
 
     obj.AddObject(
         Object::UniqueName(),
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60057-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60057-issue_3116.cpp
index 991c46bd..991c46bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60057-issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60057-issue_3116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60058-issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60058-issue_3330.cpp
index 37062480..37062480 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60058-issue_3330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60058-issue_3330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60059-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60059-indent_ctor_init.cpp
index f1b32d0e..f1b32d0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60059-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60059-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60060-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60060-returns.cpp
index 21013963..21013963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60060-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60060-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60061-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60061-returns.cpp
index bd199ba8..bd199ba8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60061-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60061-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60062-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60062-returns.cpp
index 1085bd72..1085bd72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60062-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60062-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60063-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60063-returns.cpp
index bd199ba8..bd199ba8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60063-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60063-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60064-issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60064-issue_3368.cpp
index 2158086c..2158086c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60064-issue_3368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60064-issue_3368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60065-issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60065-issue_3378.cpp
index 8da9261d..8da9261d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60065-issue_3378.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60065-issue_3378.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60066-Issue_3409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60066-Issue_3409.cpp
index 969275dc..969275dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60066-Issue_3409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60066-Issue_3409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60067-Issue_3283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60067-Issue_3283.cpp
index 9357b3b3..9357b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60067-Issue_3283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60067-Issue_3283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60068-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60068-Issue_3428.cpp
index bf1dc20b..bf1dc20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60068-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60068-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60069-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60069-Issue_3428.cpp
index 9b95f451..9b95f451 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60069-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60069-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60070-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60070-Issue_3428.cpp
index fbd35533..fbd35533 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60070-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60070-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60071-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60071-Issue_3428.cpp
index bf1dc20b..bf1dc20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60071-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60071-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60072-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60072-Issue_3428.cpp
index 9b95f451..9b95f451 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60072-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60072-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60073-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60073-Issue_3428.cpp
index fbd35533..fbd35533 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60073-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60073-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60074-Issue_3284.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60074-Issue_3284.cpp
index cea9091e..cea9091e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60074-Issue_3284.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60074-Issue_3284.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60075-Issue_3294.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60075-Issue_3294.cpp
index 4f0718cc..4f0718cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60075-Issue_3294.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60075-Issue_3294.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60076-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60076-indent_ctor_init.cpp
index 872961ce..872961ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60076-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60076-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60077-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60077-indent_ctor_init.cpp
index acf8c268..acf8c268 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60077-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60077-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60078-Issue_3505.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60078-Issue_3505.cpp
index f3225f96..f3225f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60078-Issue_3505.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60078-Issue_3505.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60079-Issue_3536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60079-Issue_3536.cpp
index 83f3e7d6..83f3e7d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60079-Issue_3536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60079-Issue_3536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60080-Issue_3538.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60080-Issue_3538.cpp
index bd60ace7..bd60ace7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60080-Issue_3538.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60080-Issue_3538.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60081-Issue_3546.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60081-Issue_3546.cpp
index 40131205..40131205 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60081-Issue_3546.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60081-Issue_3546.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60082-Issue_3552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60082-Issue_3552.cpp
index 73c2e77e..73c2e77e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60082-Issue_3552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60082-Issue_3552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60083-Issue_3570.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60083-Issue_3570.h
index a1a2fb26..a1a2fb26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60083-Issue_3570.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60083-Issue_3570.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60084-Issue_3576.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60084-Issue_3576.h
index 9fceffe8..9fceffe8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60084-Issue_3576.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60084-Issue_3576.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60085-Issue_3576.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60085-Issue_3576.h
index 9fceffe8..9fceffe8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60085-Issue_3576.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60085-Issue_3576.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60086-indent_namespace_inner_only.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60086-indent_namespace_inner_only.h
index 32668ed3..32668ed3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60086-indent_namespace_inner_only.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/cpp/60087-Issue_3550.cpp
new file mode 100644
index 00000000..91337c46
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60087-Issue_3550.cpp
@@ -0,0 +1,9 @@
+void foo(a, b)

+{

+    bool called = false;

+

+    auto callback = [&](float value)

+    {

+        called = true;

+    };

+}

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.76.0/tests/expected/cpp/60088-Issue_3761.cpp
new file mode 100644
index 00000000..b3f8cbb5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60088-Issue_3761.cpp
@@ -0,0 +1,14 @@
+void f(void (*g)())
+{
+}
+
+int main()
+{
+	f([]() {
+		int x = 1;
+		switch (x) {
+		case 1:
+			break;
+		}
+	});
+}
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.76.0/tests/expected/cpp/60089-Issue_3863.cpp
new file mode 100644
index 00000000..4163ee8e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60089-Issue_3863.cpp
@@ -0,0 +1,3 @@
+void MyClass::myFn()

+{

+}
\ No newline at end of file
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.76.0/tests/expected/cpp/60090-Issue_3863_2.cpp
new file mode 100644
index 00000000..f91c6547
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60090-Issue_3863_2.cpp
@@ -0,0 +1,3 @@
+void MyClass::myFn()

+{

+}

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.76.0/tests/expected/cpp/60091-Issue_3863_3.cpp
new file mode 100644
index 00000000..f2885f39
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60091-Issue_3863_3.cpp
@@ -0,0 +1,4 @@
+void MyClass::myFn()

+{

+}

+

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10000-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10000-simple.cs
index 36cedfa2..36cedfa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10000-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10000-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10001-getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10001-getset.cs
index 756170b6..756170b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10001-getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10001-getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10002-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10002-simple.cs
index f8344b26..f8344b26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10002-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10002-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10003-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10003-region.cs
index 2ada63e7..2ada63e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10003-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10003-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10010-var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10010-var-member.cs
index 0da0b9f5..0da0b9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10010-var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10010-var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10011-strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10011-strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10011-strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10011-strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10012-621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10012-621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10012-621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10012-621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10013-625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10013-625_where-constraints.cs
index 123109b0..123109b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10013-625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10013-625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10015-misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10015-misc-failures.cs
index e7022083..e7022083 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10015-misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10015-misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10016-new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10016-new-constraint-paren-space.cs
index a337a447..a337a447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10016-new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10016-new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10020-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10020-region.cs
index b2f57ece..b2f57ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10020-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10020-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10021-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10021-region.cs
index 926e467d..926e467d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10021-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10021-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10022-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10022-region.cs
index 9628d4fd..9628d4fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10022-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10022-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10023-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10023-region.cs
index e21c467c..e21c467c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10023-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10023-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10027-oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10027-oneline_property.cs
index e4470be2..e4470be2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10027-oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10027-oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10028-ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10028-ifcolalign.cs
index 13df0440..13df0440 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10028-ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10028-ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10029-when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10029-when.cs
index 4480f618..4480f618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10029-when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10029-when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10030-sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10030-sort_using.cs
index 99e802c1..99e802c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10030-sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10030-sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10031-bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10031-bug_i_935.cs
index c45eb79d..c45eb79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10031-bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10031-bug_i_935.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10032-sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10032-sort_using_categ.cs
index ec997fc9..ec997fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10032-sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10032-sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10039-615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10039-615_nested-usings.cs
index d46108bd..d46108bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10039-615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10039-615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10040-tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10040-tcf.cs
index 009f269e..009f269e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10040-tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10040-tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10041-gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10041-gs.cs
index ba9f873e..ba9f873e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10041-gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10041-gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10042-exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10042-exception-filters.cs
index d638d9a8..d638d9a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10042-exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10042-exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10044-ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10044-ifcomment.cs
index 2c3ab0fc..2c3ab0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10044-ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10044-ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10045-UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10045-UNI-1288.cs
index 03d60f5b..03d60f5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10045-UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10045-UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10050-generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10050-generics.cs
index 74e49ecd..74e49ecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10050-generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10050-generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10051-UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10051-UNI-1338.cs
index 3f3d9d06..3f3d9d06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10051-UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10051-UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10055-UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10055-UNI-1345.cs
index 13f61127..13f61127 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10055-UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10055-UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10060-unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10060-unsafe.cs
index fdfdd67b..fdfdd67b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10060-unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10060-unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10065-UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10065-UNI-1975.cs
index 1d2f2659..1d2f2659 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10065-UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10065-UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10066-UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10066-UNI-1977.cs
index 94b929c4..94b929c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10066-UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10066-UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10067-UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10067-UNI-1978.cs
index 5f55cb2f..5f55cb2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10067-UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10067-UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10070-utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10070-utf16le.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10070-utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10070-utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10071-utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10071-utf16be.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10071-utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10071-utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10072-utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10072-utf16le_no_bom.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10072-utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10072-utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10073-utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10073-utf16be_no_bom.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10073-utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10073-utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10074-UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10074-UNI-2020.cs
index 854a3655..854a3655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10074-UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10074-UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10075-UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10075-UNI-2021.cs
index b0ec0414..b0ec0414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10075-UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10075-UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10076-UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10076-UNI-1343.cs
index 076e338d..076e338d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10076-UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10076-UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10077-UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10077-UNI-1919.cs
index cc8e8420..cc8e8420 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10077-UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10077-UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10078-UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10078-UNI-3484.cs
index d7e4f26a..d7e4f26a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10078-UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10078-UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10080-property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10080-property.cs
index 98d3c21c..98d3c21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10080-property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10080-property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10090-string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10090-string_multi.cs
index 7d006dce..7d006dce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10090-string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10090-string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10100-bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10100-bug_600.cs
index 54c24643..54c24643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10100-bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10100-bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10101-sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10101-sf607.cs
index 3207e6c5..3207e6c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10101-sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10101-sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10103-UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10103-UNI-2506.cs
index 8cd07962..8cd07962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10103-UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10103-UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10104-UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10104-UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10104-UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10104-UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10110-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10110-mdarray_space.cs
index 8c328f5e..8c328f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10110-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10110-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10111-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10111-mdarray_space.cs
index 56aa58ce..56aa58ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10111-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10111-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10112-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10112-mdarray_space.cs
index ab877b8e..ab877b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10112-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10112-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10119-preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10119-preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10119-preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10119-preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10120-cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10120-cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10120-cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10120-cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10130-sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10130-sp_between_new_paren.cs
index fd706ffa..fd706ffa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10130-sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10130-sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10140-remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10140-remove_semi.cs
index 3ee1926e..3ee1926e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10140-remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10140-remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10150-operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10150-operator-null-conditional.cs
index 61ac6d74..61ac6d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10150-operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10150-operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10160-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10160-delegate.cs
index 6296ad80..6296ad80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10160-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10160-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10161-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10161-delegate.cs
index 152fba2b..152fba2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10161-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10161-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10200-logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10200-logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10200-logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10200-logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10300-1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10300-1822.cs
index 92b5fd5b..92b5fd5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10300-1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10300-1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10628-sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10628-sf628.cs
index 54d3c52c..54d3c52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10628-sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10628-sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11011-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11011-620_getset-brace.cs
index d4652c5f..d4652c5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11011-620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11011-620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11072-UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11072-UNI-2007.cs
index 29e53f26..29e53f26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11072-UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11072-UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11073-UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11073-UNI-2008.cs
index a4de3475..a4de3475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11073-UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11073-UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12001-bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12001-bug_620.cs
index 56e9b8bc..56e9b8bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12001-bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12001-bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12002-nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12002-nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12002-nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12002-nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
index 3dab10f6..3dab10f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12004-verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12004-verbatim_strings.cs
index 73fa1bf0..73fa1bf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12004-verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12004-verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12005-bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12005-bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12005-bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12005-bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12101-bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12101-bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12101-bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12101-bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
index e6e0eede..e6e0eede 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
index 8ecd4051..8ecd4051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12104-bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12104-bug_1637.cs
index 9ffe19e7..9ffe19e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12104-bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12104-bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12105-bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12105-bug_1650.cs
index 869a9d0f..869a9d0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12105-bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12105-bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12106-UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12106-UNI-40685.cs
index 9b70920e..9b70920e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12106-UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12106-UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12108-Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12108-Issue_2705.cs
index 08619bb1..08619bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12108-Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12108-Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12200-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12200-comma.cs
index 34ccfdd8..34ccfdd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12200-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12200-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12201-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12201-comma.cs
index 794410f0..794410f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12201-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12201-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12202-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12202-comma.cs
index 29ab2c3e..29ab2c3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12202-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12202-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/19000-UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/19000-UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/19000-UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/19000-UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20010-UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20010-UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20010-UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20010-UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20011-bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20011-bug_1620.cs
index 3b837292..3b837292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20011-bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20011-bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60004-UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60004-UNI-2684.cs
index ff0b31f1..ff0b31f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60004-UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60004-UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60005-UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60005-UNI-2685.cs
index ec671dd4..ec671dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60005-UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60005-UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60007-UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60007-UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60007-UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60007-UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60008-UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60008-UNI-17253.cs
index 9021a372..9021a372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60008-UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60008-UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60009-UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60009-UNI-9917.cs
index 5e352d10..5e352d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60009-UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60009-UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60012-UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60012-UNI-12303.cs
index 01be8291..01be8291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60012-UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60012-UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60013-UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60013-UNI-13955.cs
index 940aa89b..940aa89b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60013-UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60013-UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60015-UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60015-UNI-14131.cs
index 9656bee8..9656bee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60015-UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60015-UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60016-UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60016-UNI-11662.cs
index 9a49fdba..9a49fdba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60016-UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60016-UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60018-UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60018-UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60018-UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60018-UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60019-UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60019-UNI-18780.cs
index 0eea713e..0eea713e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60019-UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60019-UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60020-UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60020-UNI-18829.cs
index a72ca87b..a72ca87b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60020-UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60020-UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60023-UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60023-UNI-18437.cs
index d8178e73..d8178e73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60023-UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60023-UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60024-UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60024-UNI-19644.cs
index eb0d4c9c..eb0d4c9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60024-UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60024-UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60026-UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60026-UNI-19895.cs
index 1fedd580..1fedd580 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60026-UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60026-UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60033-UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60033-UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60033-UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60033-UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60036-UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60036-UNI-11993.cs
index bf703537..bf703537 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60036-UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60036-UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60037-UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60037-UNI-29933.cs
index 943cbf35..943cbf35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60037-UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60037-UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60040-UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60040-UNI-30498_2.cs
index 445a7c97..445a7c97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60040-UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60040-UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
index 2fc371c3..2fc371c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
index 4f66d541..4f66d541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60044-UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60044-UNI-37241.cs
index 57d4ffeb..57d4ffeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60044-UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60044-UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60045-add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60045-add-nl-before-namespace.cs
index d9840704..d9840704 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60045-add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60045-add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60046-cast.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60046-cast.cs
index 6c5d11db..6c5d11db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60046-cast.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60046-cast.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40000-HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40000-HashMap.d
index 80b26e1d..e90087c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40000-HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40000-HashMap.d
@@ -547,10 +547,11 @@ class HashMap
                 rehash();
 
             HashEntry[] tab;
+
             volatile tab = table;
-            uint        index = hash & (tab.length - 1);
-            HashEntry   first = tab[index];
-            HashEntry   e     = first;
+            uint      index = hash & (tab.length - 1);
+            HashEntry first = tab[index];
+            HashEntry e     = first;
 
             while (e && (e.hash != hash || !matchKey(key, e.key)))
                 e = e.next;
@@ -600,8 +601,9 @@ class HashMap
              */
 
             HashEntry[] newTable = new HashEntry[oldCapacity << 1];
+
             threshold = cast(int)(newTable.length * loadFactor);
-            int         sizeMask = newTable.length - 1;
+            int sizeMask = newTable.length - 1;
 
             for (int i = 0; i < oldCapacity; ++i)
             {
@@ -655,7 +657,6 @@ class HashMap
         final synchronized V remove(K key, uint hash, V value)
         {
             int         c;
-
             HashEntry[] tab;
 
             volatile c = count - 1;
@@ -701,6 +702,7 @@ class HashMap
             if (count)
             {
                 HashEntry[] tab;
+
                 volatile tab = table;
 
                 for (int i = 0; i < tab.length; i++)
@@ -740,6 +742,7 @@ class HashMap
         // Find power-of-two sizes best matching arguments
         int sshift = 0;
         int ssize  = 1;
+
         while (ssize < concurrencyLevel)
         {
             ++sshift;
@@ -754,10 +757,12 @@ class HashMap
             initialCapacity = MAXIMUM_CAPACITY;
 
         int c = initialCapacity / ssize;
+
         if (c * ssize < initialCapacity)
             ++c;
 
         int cap = 1;
+
         while (cap < c)
             cap <<= 1;
 
@@ -987,6 +992,7 @@ class HashMap
         while (iterator.hasNext)
         {
             char[] ca = cast(char[])iterator.next;
+
             if ((result = dg(ca)) != 0)
                 break;
         }
@@ -1007,8 +1013,8 @@ class HashMap
         while (iterator.hasNext)
         {
             HashEntry he = iterator.nextElement;
-
             char[]    ca = cast(char[])he.key;
+
             if ((result = dg(ca, he.value)) != 0)
                 break;
         }
@@ -1022,7 +1028,6 @@ class HashMap
     {
         int         nextSegmentIndex;
         int         nextTableIndex;
-
         HashEntry[] currentTable;
         HashEntry   nextEntry;
         HashEntry   lastReturned;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40001-imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40001-imports.d
index 9f12a88e..9f12a88e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40001-imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40001-imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40002-volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40002-volatile.d
index 73cdf4ac..73cdf4ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40002-volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40002-volatile.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40003-volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40003-volatile-1.d
index 2ef2634d..2ef2634d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40003-volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40003-volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40004-volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40004-volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40004-volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40004-volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40005-volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40005-volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40005-volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40005-volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40006-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40006-Lexer.d
index bc218701..9b2bf8e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40006-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40006-Lexer.d
@@ -157,6 +157,7 @@ class Lexer
     static char[] combineComments(char[] c1, char[] c2)

     {

         char[] c = c2;

+

         if (c1.length)

         {

             c = c1;

@@ -471,6 +472,7 @@ class Lexer
 

 //					sv = stringtable.update((char *)t.ptr, p - t.ptr);

                     char[] tmp;

+

                     tmp.length = p - t.ptr;

                     memcpy(tmp.ptr, t.ptr, p - t.ptr);

                     Identifier id;

@@ -2179,7 +2181,6 @@ class Lexer
     {

         Token  tok;

         int    linnum;

-

         char[] filespec;

         Loc    loc = this.loc;

 

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40007-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40007-Lexer.d
index 50f40a49..d8ddf4dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40007-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40007-Lexer.d
@@ -149,6 +149,7 @@ class Lexer
     // Combine two document comments into one.

     static char[] combineComments(char[] c1, char[] c2) {

         char[] c = c2;

+

         if (c1.length) {

             c = c1;

             if (c2.length) {

@@ -2038,7 +2039,6 @@ done:
 

 //	#if _WIN32 && __DMC__

         char *save = __locale_decpoint;

-

         __locale_decpoint = ".";

 //	#endif

         t.float80value = strtold(cast(char *)stringbuffer.data.ptr, null);

@@ -2099,7 +2099,6 @@ done:
     void Pragma() {

         Token  tok;

         int    linnum;

-

         char[] filespec;

         Loc    loc = this.loc;

 

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40010-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40010-template.d
index eaad2b5d..eaad2b5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40010-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40010-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40011-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40011-template.d
index 5c106063..5c106063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40011-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40011-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40012-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40012-template.d
index dbe1fb85..dbe1fb85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40012-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40012-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40013-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40013-template.d
index ec69b8bf..ec69b8bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40013-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40013-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40020-funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40020-funcfunc.d
index de673e78..de673e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40020-funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40020-funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40021-tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40021-tst01.d
index a2f63fc0..a2f63fc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40021-tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40021-tst01.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40022-tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40022-tst02.d
index aa138a86..aa138a86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40022-tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40022-tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40023-bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40023-bug-indent.d
index 6071604d..6071604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40023-bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40023-bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40024-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40024-tst03.d
index 2344510d..2344510d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40024-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40024-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40025-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40025-tst03.d
index 15811ebc..15811ebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40025-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40025-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40026-wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40026-wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40026-wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40026-wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40027-static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40027-static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40027-static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40027-static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40030-delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40030-delegate.d
index d06dfd05..5f7beceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40030-delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40030-delegate.d
@@ -6,7 +6,6 @@ typedef ushort          TAddr;
 
 public void delegate(ubyte[] a) TSender;
 public bool delegate(ushort a)  TVerifier;
-
 public typedef ushort   TAddr;
 
 void delegate() dg;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40035-enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40035-enum.d
index 24d0ef63..24d0ef63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40035-enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40035-enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40040-sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40040-sort_import.d
index db26c1e4..db26c1e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40040-sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40040-sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40050-strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40050-strings.d
index 4964ad7a..4964ad7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40050-strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40050-strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40051-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40051-numbers.d
index 72d55727..e6527d1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40051-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40051-numbers.d
@@ -42,5 +42,6 @@ int foo(int bar)
 void main()
 {
     char[] c = "kkkkkkkkkkkkkkkkkkkkk";
+
     writefln("%s", c[2 .. 3]);
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40052-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40052-numbers.d
index 8cf51f29..6f474984 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40052-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40052-numbers.d
@@ -39,5 +39,6 @@ int foo(int bar) {
 /* test '..' ranges */
 void main() {
     char[] c = "kkkkkkkkkkkkkkkkkkkkk";
+
     writefln("%s", c[2..3]);
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40060-casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40060-casts.d
index b1d6b50b..b1d6b50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40060-casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40060-casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40061-const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40061-const.d
index 8277f0c1..8277f0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40061-const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40061-const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40070-d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40070-d_sp_paren.d
index cc38daae..cc38daae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40070-d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40070-d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40080-static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40080-static_if.d
index 0eb3a1a8..0eb3a1a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40080-static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40080-static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40090-square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40090-square_indent_tab.d
index e9657860..e9657860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40090-square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40090-square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40100-1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40100-1438.d
index 66c47d3a..66c47d3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40100-1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40100-1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40201-invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40201-invariant.d
index 3da6240f..3da6240f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40201-invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40201-invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40300-extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40300-extern_.d
index 40131d6d..40131d6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40300-extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40300-extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40400-vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40400-vbraces000.d
index 616bb259..616bb259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40400-vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40400-vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40401-vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40401-vbraces001.d
index 6d7e96f6..6d7e96f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40401-vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40401-vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40402-vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40402-vbraces002.d
index c966d140..c966d140 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40402-vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40402-vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40403-template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40403-template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40403-template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40403-template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40500-template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40500-template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40500-template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40500-template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40501-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40501-template_spacing001.d
index dc3242ff..dc3242ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40501-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40501-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40502-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40502-template_spacing001.d
index 3c238a1f..3c238a1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40502-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40502-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40503-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40503-template_spacing001.d
index 010cbe07..010cbe07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40503-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40503-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40504-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40504-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40504-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40504-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40505-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40505-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40505-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40505-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40506-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40506-type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40506-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40506-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/ecma/90000-example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/ecma/90000-example-1.es
index 45f9b6cb..45f9b6cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/ecma/90000-example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/ecma/90000-example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80000-assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80000-assert.java
index fbc20ba7..fbc20ba7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80000-assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80000-assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80010-annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80010-annotation1.java
index 314a0b91..314a0b91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80010-annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80010-annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80011-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80011-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80011-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80011-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80012-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80012-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80012-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80012-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80013-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80013-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80013-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80013-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80014-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80014-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80014-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80014-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80020-foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80020-foreach.java
index 69967517..69967517 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80020-foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80020-foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80030-variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80030-variable_aligns.java
index c73b62d3..c73b62d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80030-variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80030-variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80040-try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80040-try.java
index 78a55849..78a55849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80040-try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80040-try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80050-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80050-double_brace.java
index e00246e1..e00246e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80050-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80050-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80051-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80051-double_brace.java
index 66183ada..66183ada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80051-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80051-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80060-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80060-synchronized.java
index b8b70a6b..b8b70a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80060-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80060-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80061-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80061-synchronized.java
index 73fc9b1d..73fc9b1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80061-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80061-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80062-sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80062-sp_this_paren.java
index 1c189223..1c189223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80062-sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80062-sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80063-i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80063-i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80063-i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80063-i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80064-long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80064-long_cl_cmt.java
index af7a1c7e..af7a1c7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80064-long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80064-long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80065-Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80065-Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80065-Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80065-Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80066-sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80066-sp_after_for_colon.java
index 38515aed..38515aed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80066-sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80066-sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80067-doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80067-doxy-javadoc-alignment.java
index 6b9f748b..6b9f748b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80067-doxy-javadoc-alignment.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80067-doxy-javadoc-alignment.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80068-nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80068-nl_before_ignore_after_case.java
index 50bfc274..50bfc274 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80068-nl_before_ignore_after_case.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80068-nl_before_ignore_after_case.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80100-sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80100-sf567.java
index 9fc644b8..9fc644b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80100-sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80100-sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80200-sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80200-sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80200-sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80200-sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80201-generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80201-generics.java
index 086786c0..086786c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80201-generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80201-generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80202-generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80202-generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80202-generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80202-generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80203-generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80203-generics_return_type.java
index 1f2aa340..1f2aa340 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80203-generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80203-generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80204-cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80204-cast.java
index 30d0dcc4..30d0dcc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80204-cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80204-cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80205-sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80205-sp_after_angle.java
index bd654485..bd654485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80205-sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80205-sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80206-annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80206-annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80206-annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80206-annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80300-Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80300-Issue_670.java
index b0aa2cf0..b0aa2cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80300-Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80300-Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80301-issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80301-issue_672.java
index 16a077a4..16a077a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80301-issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80301-issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80302-Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80302-Issue_1845.java
index 062c89d1..062c89d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80302-Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80302-Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80303-Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80303-Issue_1122.java
index 111ee739..111ee739 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80303-Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80303-Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80304-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80304-Issue_1124.java
index bca3cb33..bca3cb33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80304-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80304-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80305-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80305-Issue_1124.java
index 0469fed1..0469fed1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80305-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80305-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10018-delete-space-oc.mm
index 8760241b..8760241b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10018-delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10018-delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10019-func-param-wrap-oc.mm
index 45601228..45601228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10019-func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10019-func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10020-align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10020-align-objc-like-xcode.m
index 93066246..93066246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10020-align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10020-align-objc-like-xcode.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10021-double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10021-double-indent-objc-dict.m
index a93bd81e..a93bd81e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10021-double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10021-double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10022-indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10022-indent-objc-block.m
index 4aab0fc0..4aab0fc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10022-indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10022-indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10033-objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10033-objc.mm
index 07ede276..07ede276 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10033-objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10033-objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10034-asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10034-asm.h.mm
index 84a5efa8..84a5efa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10034-asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10034-asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10035-definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10035-definesalign.h.mm
index 9ad29954..9ad29954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10035-definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10035-definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10036-inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10036-inttypes.h.mm
index 4ac13417..4ac13417 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10036-inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10036-inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10046-UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10046-UNI-1333.mm
index 5c91693c..5c91693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10046-UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10046-UNI-1333.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10102-pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10102-pp-ignore.mm
index f26232c9..f26232c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10102-pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10102-pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11030-argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11030-argtypes.mm
index 1afeb694..1afeb694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11030-argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11030-argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11031-casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11031-casting.mm
index c73d6ef8..c73d6ef8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11031-casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11031-casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11032-newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11032-newlines.mm
index 45fd64f9..45fd64f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11032-newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11032-newlines.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50001-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50001-Fraction.h
index b1e373c2..b1e373c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50001-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50001-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50002-Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50002-Fraction.m
index 4ad6dfc8..4ad6dfc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50002-Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50002-Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50003-main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50003-main.m
index ec082dc1..ec082dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50003-main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50003-main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50004-string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50004-string.m
index bbfeb51e..bbfeb51e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50004-string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50004-string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50005-Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50005-Declarations.h
index 3b65c41c..3b65c41c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50005-Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50005-Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50006-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50006-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50006-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50006-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50007-misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50007-misc.m
index 4de222a1..4de222a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50007-misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50007-misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50008-protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50008-protocol.m
index 50c4314a..50c4314a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50008-protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50008-protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50009-literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50009-literals.mm
index 4bd99277..4bd99277 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50009-literals.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50009-literals.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50010-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50010-return_type.m
index 62275a52..62275a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50010-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50010-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50011-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50011-return_type.m
index 7cc95485..7cc95485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50011-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50011-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50012-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50012-return_type.m
index 106c5466..106c5466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50012-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50012-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
index 847e9dca..847e9dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50015-receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50015-receiver.m
index dd6ee3d6..dd6ee3d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50015-receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50015-receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50016-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50016-ternary.m
index 42a573f4..42a573f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50016-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50016-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50017-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50017-ternary.m
index d53fc319..d53fc319 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50017-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50017-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50018-indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
index 0b6e1fa3..59412a01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
@@ -21,7 +21,7 @@ iconName: selected
  ? iconName : g
 	 .re
 	 .at
-builder: nil
+	 builder:nil
 handler: ^{
 	 }
 ]
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50020-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50020-selector.m
index c53db6fb..c53db6fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50020-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50020-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50021-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50021-selector.m
index 3442f700..3442f700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50021-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50021-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50022-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50022-selector.m
index 1d790cc9..1d790cc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50022-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50022-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50025-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50025-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50025-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50025-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50026-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50026-exceptions.m
index 150de092..150de092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50026-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50026-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50030-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50030-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50030-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50030-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50031-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50031-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50031-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50031-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50032-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50032-sort_import.m
index 37b4d643..37b4d643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50032-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50032-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50033-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50033-sort_import.m
index 7c2ab21f..7c2ab21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50033-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50033-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50034-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50034-sort_import.m
index f8a42242..f8a42242 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50034-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50034-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50035-sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50035-sort_import_group.m
index 251829df..251829df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50035-sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/oc/50036-sort_import_group_regex.mm
new file mode 100644
index 00000000..633da761
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50036-sort_import_group_regex.mm
@@ -0,0 +1,1026 @@
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSNumber.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
+#import <Foundation/NSUUID.h>
+#import <UIKit/UIButton.h>
+#import <UIKit/UIControl.h>
+#import <UIKit/UIDatePicker.h>
+#import <UIKit/UILabel.h>
+#import <UIKit/UIPickerView.h>
+#import <UIKit/UISegmentedControl.h>
+#import <UIKit/UISlider.h>
+#import <UIKit/UIStackView.h>
+#import <UIKit/UIStepper.h>
+#import <UIKit/UISwitch.h>
+#import <UIKit/UITextField.h>
+#import <UIKit/UITextView.h>
+#import <UIKit/UIView.h>
+#import <UIKit/UIViewController.h>
+
+#import <CPPFramework/FrameworkFile001.hpp>
+#import <CPPFramework/FrameworkFile002.hpp>
+#import <CPPFramework/FrameworkFile003.hpp>
+#import <CPPFramework/FrameworkFile004.hpp>
+#import <CPPFramework/FrameworkFile005.hpp>
+#import <CPPFramework/FrameworkFile006.hpp>
+#import <CPPFramework/FrameworkFile007.hpp>
+#import <CPPFramework/FrameworkFile008.hpp>
+#import <CPPFramework/FrameworkFile009.hpp>
+#import <CPPFramework/FrameworkFile010.hpp>
+#import <ObjCFramework/FrameworkFile001.h>
+#import <ObjCFramework/FrameworkFile002.h>
+#import <ObjCFramework/FrameworkFile003.h>
+#import <ObjCFramework/FrameworkFile004.h>
+#import <ObjCFramework/FrameworkFile005.h>
+#import <ObjCFramework/FrameworkFile006.h>
+#import <ObjCFramework/FrameworkFile007.h>
+#import <ObjCFramework/FrameworkFile008.h>
+#import <ObjCFramework/FrameworkFile009.h>
+#import <ObjCFramework/FrameworkFile010.h>
+
+#import <CPPFramework/FrameworkFile-LowPriority-001.h>
+#import <CPPFramework/FrameworkFile-LowPriority-002.h>
+#import <CPPFramework/FrameworkFile-LowPriority-003.h>
+#import <CPPFramework/FrameworkFile-LowPriority-004.h>
+#import <CPPFramework/FrameworkFile-LowPriority-005.h>
+#import <CPPFramework/FrameworkFile-LowPriority-006.h>
+#import <CPPFramework/FrameworkFile-LowPriority-007.h>
+#import <CPPFramework/FrameworkFile-LowPriority-008.h>
+#import <CPPFramework/FrameworkFile-LowPriority-009.h>
+#import <CPPFramework/FrameworkFile-LowPriority-010.h>
+
+#import "File001.h"
+#import "File002.h"
+#import "File003.h"
+#import "File004.h"
+#import "File005.h"
+#import "File006.h"
+#import "File007.h"
+#import "File008.h"
+#import "File009.h"
+#import "File010.h"
+#import "File011.h"
+#import "File012.h"
+#import "File013.h"
+#import "File014.h"
+#import "File015.h"
+#import "File016.h"
+#import "File017.h"
+#import "File018.h"
+#import "File019.h"
+#import "File020.h"
+#import "File021.h"
+#import "File022.h"
+#import "File023.h"
+#import "File024.h"
+#import "File025.h"
+#import "File026.h"
+#import "File027.h"
+#import "File028.h"
+#import "File029.h"
+#import "File030.h"
+#import "File031.h"
+#import "File032.h"
+#import "File033.h"
+#import "File034.h"
+#import "File035.h"
+#import "File036.h"
+#import "File037.h"
+#import "File038.h"
+#import "File039.h"
+#import "File040.h"
+#import "File041.h"
+#import "File042.h"
+#import "File043.h"
+#import "File044.h"
+#import "File045.h"
+#import "File046.h"
+#import "File047.h"
+#import "File048.h"
+#import "File049.h"
+#import "File050.h"
+#import "File051.h"
+#import "File052.h"
+#import "File053.h"
+#import "File054.h"
+#import "File055.h"
+#import "File056.h"
+#import "File057.h"
+#import "File058.h"
+#import "File059.h"
+#import "File060.h"
+#import "File061.h"
+#import "File062.h"
+#import "File063.h"
+#import "File064.h"
+#import "File065.h"
+#import "File066.h"
+#import "File067.h"
+#import "File068.h"
+#import "File069.h"
+#import "File070.h"
+#import "File071.h"
+#import "File072.h"
+#import "File073.h"
+#import "File074.h"
+#import "File075.h"
+#import "File076.h"
+#import "File077.h"
+#import "File078.h"
+#import "File079.h"
+#import "File080.h"
+#import "File081.h"
+#import "File082.h"
+#import "File083.h"
+#import "File084.h"
+#import "File085.h"
+#import "File086.h"
+#import "File087.h"
+#import "File088.h"
+#import "File089.h"
+#import "File090.h"
+#import "File091.h"
+#import "File092.h"
+#import "File093.h"
+#import "File094.h"
+#import "File095.h"
+#import "File096.h"
+#import "File097.h"
+#import "File098.h"
+#import "File099.h"
+#import "File100.h"
+#import "File101.h"
+#import "File102.h"
+#import "File103.h"
+#import "File104.h"
+#import "File105.h"
+#import "File106.h"
+#import "File107.h"
+#import "File108.h"
+#import "File109.h"
+#import "File110.h"
+#import "File111.h"
+#import "File112.h"
+#import "File113.h"
+#import "File114.h"
+#import "File115.h"
+#import "File116.h"
+#import "File117.h"
+#import "File118.h"
+#import "File119.h"
+#import "File120.h"
+#import "File121.h"
+#import "File122.h"
+#import "File123.h"
+#import "File124.h"
+#import "File125.h"
+#import "File126.h"
+#import "File127.h"
+#import "File128.h"
+#import "File129.h"
+#import "File130.h"
+#import "File131.h"
+#import "File132.h"
+#import "File133.h"
+#import "File134.h"
+#import "File135.h"
+#import "File136.h"
+#import "File137.h"
+#import "File138.h"
+#import "File139.h"
+#import "File140.h"
+#import "File141.h"
+#import "File142.h"
+#import "File143.h"
+#import "File144.h"
+#import "File145.h"
+#import "File146.h"
+#import "File147.h"
+#import "File148.h"
+#import "File149.h"
+#import "File150.h"
+#import "File151.h"
+#import "File152.h"
+#import "File153.h"
+#import "File154.h"
+#import "File155.h"
+#import "File156.h"
+#import "File157.h"
+#import "File158.h"
+#import "File159.h"
+#import "File160.h"
+#import "File161.h"
+#import "File162.h"
+#import "File163.h"
+#import "File164.h"
+#import "File165.h"
+#import "File166.h"
+#import "File167.h"
+#import "File168.h"
+#import "File169.h"
+#import "File170.h"
+#import "File171.h"
+#import "File172.h"
+#import "File173.h"
+#import "File174.h"
+#import "File175.h"
+#import "File176.h"
+#import "File177.h"
+#import "File178.h"
+#import "File179.h"
+#import "File180.h"
+#import "File181.h"
+#import "File182.h"
+#import "File183.h"
+#import "File184.h"
+#import "File185.h"
+#import "File186.h"
+#import "File187.h"
+#import "File188.h"
+#import "File189.h"
+#import "File190.h"
+#import "File191.h"
+#import "File192.h"
+#import "File193.h"
+#import "File194.h"
+#import "File195.h"
+#import "File196.h"
+#import "File197.h"
+#import "File198.h"
+#import "File199.h"
+#import "File200.h"
+#import "File201.h"
+#import "File202.h"
+#import "File203.h"
+#import "File204.h"
+#import "File205.h"
+#import "File206.h"
+#import "File207.h"
+#import "File208.h"
+#import "File209.h"
+#import "File210.h"
+#import "File211.h"
+#import "File212.h"
+#import "File213.h"
+#import "File214.h"
+#import "File215.h"
+#import "File216.h"
+#import "File217.h"
+#import "File218.h"
+#import "File219.h"
+#import "File220.h"
+#import "File221.h"
+#import "File222.h"
+#import "File223.h"
+#import "File224.h"
+#import "File225.h"
+#import "File226.h"
+#import "File227.h"
+#import "File228.h"
+#import "File229.h"
+#import "File230.h"
+#import "File231.h"
+#import "File232.h"
+#import "File233.h"
+#import "File234.h"
+#import "File235.h"
+#import "File236.h"
+#import "File237.h"
+#import "File238.h"
+#import "File239.h"
+#import "File240.h"
+#import "File241.h"
+#import "File242.h"
+#import "File243.h"
+#import "File244.h"
+#import "File245.h"
+#import "File246.h"
+#import "File247.h"
+#import "File248.h"
+#import "File249.h"
+#import "File250.h"
+#import "File251.h"
+#import "File252.h"
+#import "File253.h"
+#import "File254.h"
+#import "File255.h"
+#import "File256.h"
+#import "File257.h"
+#import "File258.h"
+#import "File259.h"
+#import "File260.h"
+#import "File261.h"
+#import "File262.h"
+#import "File263.h"
+#import "File264.h"
+#import "File265.h"
+#import "File266.h"
+#import "File267.h"
+#import "File268.h"
+#import "File269.h"
+#import "File270.h"
+#import "File271.h"
+#import "File272.h"
+#import "File273.h"
+#import "File274.h"
+#import "File275.h"
+#import "File276.h"
+#import "File277.h"
+#import "File278.h"
+#import "File279.h"
+#import "File280.h"
+#import "File281.h"
+#import "File282.h"
+#import "File283.h"
+#import "File284.h"
+#import "File285.h"
+#import "File286.h"
+#import "File287.h"
+#import "File288.h"
+#import "File289.h"
+#import "File290.h"
+#import "File291.h"
+#import "File292.h"
+#import "File293.h"
+#import "File294.h"
+#import "File295.h"
+#import "File296.h"
+#import "File297.h"
+#import "File298.h"
+#import "File299.h"
+#import "File300.h"
+#import "File301.h"
+#import "File302.h"
+#import "File303.h"
+#import "File304.h"
+#import "File305.h"
+#import "File306.h"
+#import "File307.h"
+#import "File308.h"
+#import "File309.h"
+#import "File310.h"
+#import "File311.h"
+#import "File312.h"
+#import "File313.h"
+#import "File314.h"
+#import "File315.h"
+#import "File316.h"
+#import "File317.h"
+#import "File318.h"
+#import "File319.h"
+#import "File320.h"
+#import "File321.h"
+#import "File322.h"
+#import "File323.h"
+#import "File324.h"
+#import "File325.h"
+#import "File326.h"
+#import "File327.h"
+#import "File328.h"
+#import "File329.h"
+#import "File330.h"
+#import "File331.h"
+#import "File332.h"
+#import "File333.h"
+#import "File334.h"
+#import "File335.h"
+#import "File336.h"
+#import "File337.h"
+#import "File338.h"
+#import "File339.h"
+#import "File340.h"
+#import "File341.h"
+#import "File342.h"
+#import "File343.h"
+#import "File344.h"
+#import "File345.h"
+#import "File346.h"
+#import "File347.h"
+#import "File348.h"
+#import "File349.h"
+#import "File350.h"
+#import "File351.h"
+#import "File352.h"
+#import "File353.h"
+#import "File354.h"
+#import "File355.h"
+#import "File356.h"
+#import "File357.h"
+#import "File358.h"
+#import "File359.h"
+#import "File360.h"
+#import "File361.h"
+#import "File362.h"
+#import "File363.h"
+#import "File364.h"
+#import "File365.h"
+#import "File366.h"
+#import "File367.h"
+#import "File368.h"
+#import "File369.h"
+#import "File370.h"
+#import "File371.h"
+#import "File372.h"
+#import "File373.h"
+#import "File374.h"
+#import "File375.h"
+#import "File376.h"
+#import "File377.h"
+#import "File378.h"
+#import "File379.h"
+#import "File380.h"
+#import "File381.h"
+#import "File382.h"
+#import "File383.h"
+#import "File384.h"
+#import "File385.h"
+#import "File386.h"
+#import "File387.h"
+#import "File388.h"
+#import "File389.h"
+#import "File390.h"
+#import "File391.h"
+#import "File392.h"
+#import "File393.h"
+#import "File394.h"
+#import "File395.h"
+#import "File396.h"
+#import "File397.h"
+#import "File398.h"
+#import "File399.h"
+#import "File400.h"
+#import "File401.h"
+#import "File402.h"
+#import "File403.h"
+#import "File404.h"
+#import "File405.h"
+#import "File406.h"
+#import "File407.h"
+#import "File408.h"
+#import "File409.h"
+#import "File410.h"
+#import "File411.h"
+#import "File412.h"
+#import "File413.h"
+#import "File414.h"
+#import "File415.h"
+#import "File416.h"
+#import "File417.h"
+#import "File418.h"
+#import "File419.h"
+#import "File420.h"
+#import "File421.h"
+#import "File422.h"
+#import "File423.h"
+#import "File424.h"
+#import "File425.h"
+#import "File426.h"
+#import "File427.h"
+#import "File428.h"
+#import "File429.h"
+#import "File430.h"
+#import "File431.h"
+#import "File432.h"
+#import "File433.h"
+#import "File434.h"
+#import "File435.h"
+#import "File436.h"
+#import "File437.h"
+#import "File438.h"
+#import "File439.h"
+#import "File440.h"
+#import "File441.h"
+#import "File442.h"
+#import "File443.h"
+#import "File444.h"
+#import "File445.h"
+#import "File446.h"
+#import "File447.h"
+#import "File448.h"
+#import "File449.h"
+#import "File450.h"
+#import "File451.h"
+#import "File452.h"
+#import "File453.h"
+#import "File454.h"
+#import "File455.h"
+#import "File456.h"
+#import "File457.h"
+#import "File458.h"
+#import "File459.h"
+#import "File460.h"
+#import "File461.h"
+#import "File462.h"
+#import "File463.h"
+#import "File464.h"
+#import "File465.h"
+#import "File466.h"
+#import "File467.h"
+#import "File468.h"
+#import "File469.h"
+#import "File470.h"
+#import "File471.h"
+#import "File472.h"
+#import "File473.h"
+#import "File474.h"
+#import "File475.h"
+#import "File476.h"
+#import "File477.h"
+#import "File478.h"
+#import "File479.h"
+#import "File480.h"
+#import "File481.h"
+#import "File482.h"
+#import "File483.h"
+#import "File484.h"
+#import "File485.h"
+#import "File486.h"
+#import "File487.h"
+#import "File488.h"
+#import "File489.h"
+#import "File490.h"
+#import "File491.h"
+#import "File492.h"
+#import "File493.h"
+#import "File494.h"
+#import "File495.h"
+#import "File496.h"
+#import "File497.h"
+#import "File498.h"
+#import "File499.h"
+#import "File500.h"
+#import "File501.h"
+#import "File502.h"
+#import "File503.h"
+#import "File504.h"
+#import "File505.h"
+#import "File506.h"
+#import "File507.h"
+#import "File508.h"
+#import "File509.h"
+#import "File510.h"
+#import "File511.h"
+#import "File512.h"
+#import "File513.h"
+#import "File514.h"
+#import "File515.h"
+#import "File516.h"
+#import "File517.h"
+#import "File518.h"
+#import "File519.h"
+#import "File520.h"
+#import "File521.h"
+#import "File522.h"
+#import "File523.h"
+#import "File524.h"
+#import "File525.h"
+#import "File526.h"
+#import "File527.h"
+#import "File528.h"
+#import "File529.h"
+#import "File530.h"
+#import "File531.h"
+#import "File532.h"
+#import "File533.h"
+#import "File534.h"
+#import "File535.h"
+#import "File536.h"
+#import "File537.h"
+#import "File538.h"
+#import "File539.h"
+#import "File540.h"
+#import "File541.h"
+#import "File542.h"
+#import "File543.h"
+#import "File544.h"
+#import "File545.h"
+#import "File546.h"
+#import "File547.h"
+#import "File548.h"
+#import "File549.h"
+#import "File550.h"
+#import "File551.h"
+#import "File552.h"
+#import "File553.h"
+#import "File554.h"
+#import "File555.h"
+#import "File556.h"
+#import "File557.h"
+#import "File558.h"
+#import "File559.h"
+#import "File560.h"
+#import "File561.h"
+#import "File562.h"
+#import "File563.h"
+#import "File564.h"
+#import "File565.h"
+#import "File566.h"
+#import "File567.h"
+#import "File568.h"
+#import "File569.h"
+#import "File570.h"
+#import "File571.h"
+#import "File572.h"
+#import "File573.h"
+#import "File574.h"
+#import "File575.h"
+#import "File576.h"
+#import "File577.h"
+#import "File578.h"
+#import "File579.h"
+#import "File580.h"
+#import "File581.h"
+#import "File582.h"
+#import "File583.h"
+#import "File584.h"
+#import "File585.h"
+#import "File586.h"
+#import "File587.h"
+#import "File588.h"
+#import "File589.h"
+#import "File590.h"
+#import "File591.h"
+#import "File592.h"
+#import "File593.h"
+#import "File594.h"
+#import "File595.h"
+#import "File596.h"
+#import "File597.h"
+#import "File598.h"
+#import "File599.h"
+#import "File600.h"
+#import "File601.h"
+#import "File602.h"
+#import "File603.h"
+#import "File604.h"
+#import "File605.h"
+#import "File606.h"
+#import "File607.h"
+#import "File608.h"
+#import "File609.h"
+#import "File610.h"
+#import "File611.h"
+#import "File612.h"
+#import "File613.h"
+#import "File614.h"
+#import "File615.h"
+#import "File616.h"
+#import "File617.h"
+#import "File618.h"
+#import "File619.h"
+#import "File620.h"
+#import "File621.h"
+#import "File622.h"
+#import "File623.h"
+#import "File624.h"
+#import "File625.h"
+#import "File626.h"
+#import "File627.h"
+#import "File628.h"
+#import "File629.h"
+#import "File630.h"
+#import "File631.h"
+#import "File632.h"
+#import "File633.h"
+#import "File634.h"
+#import "File635.h"
+#import "File636.h"
+#import "File637.h"
+#import "File638.h"
+#import "File639.h"
+#import "File640.h"
+#import "File641.h"
+#import "File642.h"
+#import "File643.h"
+#import "File644.h"
+#import "File645.h"
+#import "File646.h"
+#import "File647.h"
+#import "File648.h"
+#import "File649.h"
+#import "File650.h"
+#import "File651.h"
+#import "File652.h"
+#import "File653.h"
+#import "File654.h"
+#import "File655.h"
+#import "File656.h"
+#import "File657.h"
+#import "File658.h"
+#import "File659.h"
+#import "File660.h"
+#import "File661.h"
+#import "File662.h"
+#import "File663.h"
+#import "File664.h"
+#import "File665.h"
+#import "File666.h"
+#import "File667.h"
+#import "File668.h"
+#import "File669.h"
+#import "File670.h"
+#import "File671.h"
+#import "File672.h"
+#import "File673.h"
+#import "File674.h"
+#import "File675.h"
+#import "File676.h"
+#import "File677.h"
+#import "File678.h"
+#import "File679.h"
+#import "File680.h"
+#import "File681.h"
+#import "File682.h"
+#import "File683.h"
+#import "File684.h"
+#import "File685.h"
+#import "File686.h"
+#import "File687.h"
+#import "File688.h"
+#import "File689.h"
+#import "File690.h"
+#import "File691.h"
+#import "File692.h"
+#import "File693.h"
+#import "File694.h"
+#import "File695.h"
+#import "File696.h"
+#import "File697.h"
+#import "File698.h"
+#import "File699.h"
+#import "File700.h"
+#import "File701.h"
+#import "File702.h"
+#import "File703.h"
+#import "File704.h"
+#import "File705.h"
+#import "File706.h"
+#import "File707.h"
+#import "File708.h"
+#import "File709.h"
+#import "File710.h"
+#import "File711.h"
+#import "File712.h"
+#import "File713.h"
+#import "File714.h"
+#import "File715.h"
+#import "File716.h"
+#import "File717.h"
+#import "File718.h"
+#import "File719.h"
+#import "File720.h"
+#import "File721.h"
+#import "File722.h"
+#import "File723.h"
+#import "File724.h"
+#import "File725.h"
+#import "File726.h"
+#import "File727.h"
+#import "File728.h"
+#import "File729.h"
+#import "File730.h"
+#import "File731.h"
+#import "File732.h"
+#import "File733.h"
+#import "File734.h"
+#import "File735.h"
+#import "File736.h"
+#import "File737.h"
+#import "File738.h"
+#import "File739.h"
+#import "File740.h"
+#import "File741.h"
+#import "File742.h"
+#import "File743.h"
+#import "File744.h"
+#import "File745.h"
+#import "File746.h"
+#import "File747.h"
+#import "File748.h"
+#import "File749.h"
+#import "File750.h"
+#import "File751.h"
+#import "File752.h"
+#import "File753.h"
+#import "File754.h"
+#import "File755.h"
+#import "File756.h"
+#import "File757.h"
+#import "File758.h"
+#import "File759.h"
+#import "File760.h"
+#import "File761.h"
+#import "File762.h"
+#import "File763.h"
+#import "File764.h"
+#import "File765.h"
+#import "File766.h"
+#import "File767.h"
+#import "File768.h"
+#import "File769.h"
+#import "File770.h"
+#import "File771.h"
+#import "File772.h"
+#import "File773.h"
+#import "File774.h"
+#import "File775.h"
+#import "File776.h"
+#import "File777.h"
+#import "File778.h"
+#import "File779.h"
+#import "File780.h"
+#import "File781.h"
+#import "File782.h"
+#import "File783.h"
+#import "File784.h"
+#import "File785.h"
+#import "File786.h"
+#import "File787.h"
+#import "File788.h"
+#import "File789.h"
+#import "File790.h"
+#import "File791.h"
+#import "File792.h"
+#import "File793.h"
+#import "File794.h"
+#import "File795.h"
+#import "File796.h"
+#import "File797.h"
+#import "File798.h"
+#import "File799.h"
+#import "File800.h"
+#import "File801.h"
+#import "File802.h"
+#import "File803.h"
+#import "File804.h"
+#import "File805.h"
+#import "File806.h"
+#import "File807.h"
+#import "File808.h"
+#import "File809.h"
+#import "File810.h"
+#import "File811.h"
+#import "File812.h"
+#import "File813.h"
+#import "File814.h"
+#import "File815.h"
+#import "File816.h"
+#import "File817.h"
+#import "File818.h"
+#import "File819.h"
+#import "File820.h"
+#import "File821.h"
+#import "File822.h"
+#import "File823.h"
+#import "File824.h"
+#import "File825.h"
+#import "File826.h"
+#import "File827.h"
+#import "File828.h"
+#import "File829.h"
+#import "File830.h"
+#import "File831.h"
+#import "File832.h"
+#import "File833.h"
+#import "File834.h"
+#import "File835.h"
+#import "File836.h"
+#import "File837.h"
+#import "File838.h"
+#import "File839.h"
+#import "File840.h"
+#import "File841.h"
+#import "File842.h"
+#import "File843.h"
+#import "File844.h"
+#import "File845.h"
+#import "File846.h"
+#import "File847.h"
+#import "File848.h"
+#import "File849.h"
+#import "File850.h"
+#import "File851.h"
+#import "File852.h"
+#import "File853.h"
+#import "File854.h"
+#import "File855.h"
+#import "File856.h"
+#import "File857.h"
+#import "File858.h"
+#import "File859.h"
+#import "File860.h"
+#import "File861.h"
+#import "File862.h"
+#import "File863.h"
+#import "File864.h"
+#import "File865.h"
+#import "File866.h"
+#import "File867.h"
+#import "File868.h"
+#import "File869.h"
+#import "File870.h"
+#import "File871.h"
+#import "File872.h"
+#import "File873.h"
+#import "File874.h"
+#import "File875.h"
+#import "File876.h"
+#import "File877.h"
+#import "File878.h"
+#import "File879.h"
+#import "File880.h"
+#import "File881.h"
+#import "File882.h"
+#import "File883.h"
+#import "File884.h"
+#import "File885.h"
+#import "File886.h"
+#import "File887.h"
+#import "File888.h"
+#import "File889.h"
+#import "File890.h"
+#import "File891.h"
+#import "File892.h"
+#import "File893.h"
+#import "File894.h"
+#import "File895.h"
+#import "File896.h"
+#import "File897.h"
+#import "File898.h"
+#import "File899.h"
+#import "File900.h"
+#import "File901.h"
+#import "File902.h"
+#import "File903.h"
+#import "File904.h"
+#import "File905.h"
+#import "File906.h"
+#import "File907.h"
+#import "File908.h"
+#import "File909.h"
+#import "File910.h"
+#import "File911.h"
+#import "File912.h"
+#import "File913.h"
+#import "File914.h"
+#import "File915.h"
+#import "File916.h"
+#import "File917.h"
+#import "File918.h"
+#import "File919.h"
+#import "File920.h"
+#import "File921.h"
+#import "File922.h"
+#import "File923.h"
+#import "File924.h"
+#import "File925.h"
+#import "File926.h"
+#import "File927.h"
+#import "File928.h"
+#import "File929.h"
+#import "File930.h"
+#import "File931.h"
+#import "File932.h"
+#import "File933.h"
+#import "File934.h"
+#import "File935.h"
+#import "File936.h"
+#import "File937.h"
+#import "File938.h"
+#import "File939.h"
+#import "File940.h"
+#import "File941.h"
+#import "File942.h"
+#import "File943.h"
+#import "File944.h"
+#import "File945.h"
+#import "File946.h"
+#import "File947.h"
+#import "File948.h"
+#import "File949.h"
+#import "File950.h"
+#import "File951.h"
+#import "File952.h"
+#import "File953.h"
+#import "File954.h"
+#import "File955.h"
+#import "File956.h"
+#import "File957.h"
+#import "File958.h"
+#import "File959.h"
+#import "File960.h"
+#import "File961.h"
+#import "File962.h"
+#import "File963.h"
+#import "File964.h"
+#import "File965.h"
+#import "File966.h"
+#import "File967.h"
+#import "File968.h"
+#import "File969.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50040-complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50040-complex_method.m
index 29467813..29467813 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50040-complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50040-complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50050-real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50050-real_world_file.m
index a4bf639e..a4bf639e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50050-real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50050-real_world_file.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50060-oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50060-oc-split.m
index a7bcd4de..a7bcd4de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50060-oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50060-oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50061-bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50061-bug_167.m
index 28087bb4..28087bb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50061-bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50061-bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50062-issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50062-issue_2631.m
index a4404650..a4404650 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50062-issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50062-issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50070-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50070-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50070-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50070-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50071-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50071-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50071-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50071-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50072-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50072-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50072-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50072-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50073-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50073-blocks.m
index 06a9cd78..06a9cd78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50073-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50073-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50074-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50074-blocks.m
index 467387b4..467387b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50074-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50074-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50075-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50075-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50075-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50075-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50076-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50076-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50076-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50076-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50077-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50077-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50077-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50077-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50078-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50078-more_blocks.m
index 91d27d55..91d27d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50078-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50078-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50079-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50079-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50079-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50079-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50080-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50080-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50080-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50080-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50081-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50081-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50081-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50081-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50082-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50082-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50082-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50082-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50083-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50083-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50083-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50083-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50084-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50084-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50084-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50084-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50085-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50085-block_in_method.m
index 7a91d13e..7a91d13e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50085-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50085-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50086-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50086-block_in_method.m
index c5c9ae6b..c5c9ae6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50086-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50086-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
index af5c2b7b..af5c2b7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50090-kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50090-kw.m
index ef52dd8e..ef52dd8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50090-kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50090-kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50091-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50091-block_in_method.m
index 705435d8..705435d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50091-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50091-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50095-box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50095-box.m
index 45b0de1b..45b0de1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50095-box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50095-box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50100-bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50100-bug_340.m
index ec5135ab..ec5135ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50100-bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50100-bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50110-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50110-msg_align.m
index 041148c1..041148c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50110-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50110-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50111-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50111-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50111-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50111-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50112-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50112-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50112-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50112-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50113-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50113-ns_enum.m
index 5c30d740..5c30d740 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50113-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50113-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50120-gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50120-gh137.m
index ff41543a..ff41543a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50120-gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50120-gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50200-more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50200-more_blocks_2.m
index 8835454f..8835454f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50200-more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50200-more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50201-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50201-blocks_align.m
index 505c9b99..505c9b99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50201-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50201-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50202-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50202-blocks_align.m
index 439ac716..439ac716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50202-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50202-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50203-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50203-blocks_align.m
index 07bd3cf3..07bd3cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50203-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50203-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50204-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50204-blocks_align.m
index a2cefc1f..a2cefc1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50204-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50204-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50205-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50205-msg_align.m
index f024b44c..f024b44c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50205-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50205-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50206-issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50206-issue_2727.m
index 5639c298..5639c298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50206-issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50206-issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50207-issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50207-issue_3031.mm
index 75e6f5ea..75e6f5ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50207-issue_3031.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50207-issue_3031.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50300-msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50300-msg.m
index 79c1a60a..79c1a60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50300-msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50300-msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50400-for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50400-for.m
index 35c34bce..35c34bce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50400-for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50400-for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50410-oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50410-oc_cond_colon.m
index 8059a3c6..8059a3c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50410-oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50410-oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50411-attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
index 49dfaefa..49dfaefa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50500-code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50500-code_placeholder.m
index f6a745ed..f6a745ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50500-code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50500-code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50510-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50510-gh293.m
index a1dffc49..a1dffc49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50510-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50510-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50511-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50511-gh293.m
index 6e4c180a..6e4c180a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50511-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50511-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50512-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50512-sp_oc_catch.m
index 6040b071..6040b071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50512-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50512-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50513-sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50513-sp_oc_boxed.m
index 916e9330..916e9330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50513-sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50513-sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50514-indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50514-indent_boxed.m
index 165ee244..165ee244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50514-indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50514-indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50515-sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50515-sp_oc_synchronized.m
index ffff5618..ffff5618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50515-sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50515-sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50600-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50600-bug_i_477.m
index 0e7cbb78..0e7cbb78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50600-bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50600-bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50601-bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50601-bug_i_408.m
index 700d159d..700d159d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50601-bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50601-bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50602-bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50602-bug_i_125-412.m
index 4beec2d5..4beec2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50602-bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50602-bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50603-gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50603-gh511.m
index 2c86e32d..2c86e32d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50603-gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50603-gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50604-bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50604-bug_497.m
index 121503b4..121503b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50604-bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50604-bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50605-bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50605-bug_404.m
index 8244ebd3..8244ebd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50605-bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50605-bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50606-bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50606-bug_1366.m
index f4058b1f..f4058b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50606-bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50606-bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
index 14eaed36..14eaed36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50608-blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50608-blocks_align2.m
index b37c1b4b..b37c1b4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50608-blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50608-blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50609-negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50609-negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50609-negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50609-negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50610-nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50610-nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50610-nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50610-nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50611-for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50611-for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50611-for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50611-for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50612-chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50612-chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50612-chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50612-chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50613-chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50613-chunk_ends_type2.m
index 64efc7e6..64efc7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50613-chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50613-chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50614-chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50614-chunk_ends_type3.m
index 8f0ae62c..8f0ae62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50614-chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50614-chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50615-block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50615-block_literal_protocol.m
index 35879a0e..35879a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50615-block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50615-block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50616-oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50616-oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50616-oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50616-oc_msg_in_pp.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50617-boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50617-boxed_receiver.m
index e4c247fd..e4c247fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50617-boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50617-boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50618-func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50618-func_def.mm
index 49de2fea..49de2fea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50618-func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50618-func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50619-cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50619-cast.m
index 1e588579..1e588579 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50619-cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50619-cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50620-sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50620-sp_after_angle.m
index 318071ba..318071ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50620-sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50620-sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50621-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50621-Fraction.h
index 77403abd..77403abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50621-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50621-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
index f17c10ed..f17c10ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50623-extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50623-extern-c-attribute.m
index 1c752682..1c752682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50623-extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50623-extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50624-typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50624-typeof.m
index 968aad5a..968aad5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50624-typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50624-typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
index f98a27ea..f98a27ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50626-chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50626-chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50626-chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50626-chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50627-method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50627-method_ends_semicolon.m
index b1ca36fa..b1ca36fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50627-method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50627-method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50628-macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50628-macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50628-macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50628-macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50629-pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50629-pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50629-pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50629-pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.75.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/oc/50631-nl_oc_msg_args_min_params.m
new file mode 100644
index 00000000..441321d4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50631-nl_oc_msg_args_min_params.m
@@ -0,0 +1,32 @@
+static void function() {
+    [object param1:nil
+            param2:nil
+            param3:nil
+            param4:nil];
+
+    [object param1:nil param2:nil param3:nil];
+
+    [object param1:nil param2:nil];
+
+    [object param1:nil];
+
+    [object func];
+
+    [obj param1:nil param2:nil param3:[obj2 param1:nil param2:nil]];
+
+    [obj param1:nil
+         param2:[obj2 param1:nil
+                      param2:nil
+                      param3:nil
+                      param4:nil
+                      param5:nil
+                      param6:nil]
+         param3:nil];
+
+    [obj param1:nil param2:[obj2 param1:nil
+                                 param2:nil
+                                 param3:nil
+                                 param4:nil
+                                 param5:nil
+                                 param6:nil] param3:nil];
+}
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.76.0/tests/expected/oc/50632-nl_oc_msg_args_max_code_width.m
new file mode 100644
index 00000000..0ee1dae1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50632-nl_oc_msg_args_max_code_width.m
@@ -0,0 +1,21 @@
+static void function() {
+    [object param1:nil param2:nil param3:nil param4:nil];
+
+    [object param1:nil param2:nil param3:nil];
+
+    [object param1:nil param2:nil];
+
+    [object param1:nil];
+
+    [object func];
+
+    [obj param1:nil param2:nil param3:[obj2 param1:nil param2:nil]];
+
+    [obj param1:nil
+         param2:[obj2 param1:nil param2:nil param3:nil param4:nil param5:nil param6:nil]
+         param3:nil];
+
+    [obj param1:nil
+         param2:[obj2 param1:nil param2:nil param3:nil param4:nil param5:nil param6:nil]
+         param3:nil];
+}
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.76.0/tests/expected/oc/50633-ocpp_msg_access.mm
new file mode 100644
index 00000000..ee2dbe03
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50633-ocpp_msg_access.mm
@@ -0,0 +1,4 @@
+NSValue *result = [anObject
+     public:value1
+   argument:arg
+    signals:value2];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50700-cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50700-cmt_insert.m
index ec94c42b..ec94c42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50700-cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50700-cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50701-cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50701-cmt_insert2.m
index 7a90cc57..7a90cc57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50701-cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50701-cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50800-properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50800-properties.m
index fa9ca930..fa9ca930 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50800-properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50800-properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50801-i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50801-i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50801-i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50801-i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50802-available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50802-available.m
index 5054043a..5054043a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50802-available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50802-available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50803-indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50803-indent_single_newline.m
index a70184e5..a70184e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50803-indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50803-indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50804-issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50804-issue_2629.m
index 6d6cbf30..6d6cbf30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50804-issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50804-issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50805-issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50805-issue_2724.m
index 23241732..23241732 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50805-issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50805-issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50810-bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50810-bug_841.m
index 8e8a6713..8e8a6713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50810-bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50810-bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50811-bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50811-bug_1674.m
index 7d23b230..7d23b230 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50811-bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50811-bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50812-bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50812-bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50812-bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50812-bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50813-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
index 65d13399..65d13399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50814-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
index be1f49ed..be1f49ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50815-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
index 1fef0cc4..1fef0cc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50816-issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50816-issue_2675.m
index ccb80f6b..ccb80f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50816-issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50816-issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50817-issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50817-issue_2722.m
index 8919895a..8919895a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50817-issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50817-issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50900-1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50900-1927.m
index 3ae39e47..3ae39e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50900-1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50900-1927.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50901-Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50901-Issue_2172.m
index efa73591..efa73591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50901-Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50901-Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50902-Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50902-Issue_2289.m
index 19fe5cdf..19fe5cdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50902-Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50902-Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50903-Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50903-Issue_681.oc
index 1e71cdaa..1e71cdaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50903-Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50903-Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50904-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50904-double_angle_space.m
index 0e6c0c0c..0e6c0c0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50904-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50904-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50905-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50905-double_angle_space.m
index 9636a38e..9636a38e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50905-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50905-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50906-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50906-double_angle_space.m
index 5c16c25f..5c16c25f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50906-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/oc/50907-align_colon_with_ternary_1.m
new file mode 100644
index 00000000..2b5f1ef8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50907-align_colon_with_ternary_1.m
@@ -0,0 +1,48 @@
+static void func() {
+	[object test:NO ? PARAM1 : PARAM2
+	       test2:YES];
+}
+
+static void func() {
+	[object test:NO ? PARAM1 : PARAM2
+	       test2:YES
+	       test3:YES];
+}
+
+static void func() {
+	[object test:NO ? PARAM1 : PARAM2
+	       test2:YES
+	       test3:YES ? PARAM1 : PARAM2
+	       test4:NO];
+}
+
+static void func() {
+	[object test:NO ? PARAM1 : YES
+    ? nil:nil
+	       test2:YES
+	       test3:YES ? PARAM1 : PARAM2
+	       test4:NO];
+}
+
+// Note: This is an extreme case and in the future we may add rules that update this formatting
+static void func() {
+	NSString *s = YES ? [object test:NO ? PARAM1 : YES
+    ?                                nil:nil
+	                           test2:YES
+	                           test3:YES ? PARAM1 : PARAM2
+	                           test4:NO] : [object test:NO ? PARAM1 : YES
+    ? nil:nil
+	                                              test2:YES
+	                                              test3:YES ? PARAM1 : PARAM2
+	                                              test4:NO];
+}
+
+static void func() {
+	NSString *s = YES ? [object test:NO ? PARAM1 : YES ? nil : nil
+	                           test2:YES
+	                           test3:YES ? PARAM1 : PARAM2
+	                           test4:NO] : [object test:NO ? PARAM1 : YES ? nil : nil
+	                                              test2:YES
+	                                              test3:YES ? PARAM1 : PARAM2
+	                                              test4:NO];
+}
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.76.0/tests/expected/oc/50908-align_colon_with_ternary_2.m
new file mode 100644
index 00000000..bfca2a80
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50908-align_colon_with_ternary_2.m
@@ -0,0 +1,31 @@
+static void func() {
+	[object test:NO ? PARAM1 : PARAM2 test2:YES];
+}
+
+
+static void func() {
+	[object test:NO ? PARAM1 : PARAM2
+	       test2:YES
+	       test3:YES];
+}
+
+static void func() {
+	[object test:NO ? PARAM1 : PARAM2
+	       test2:YES
+	       test3:YES ? PARAM1 : PARAM2
+	       test4:NO];
+}
+
+static void func() {
+	[object test:NO ? PARAM1 : YES ? nil:nil
+	       test2:YES
+	       test3:YES ? PARAM1 : PARAM2
+	       test4:NO];
+}
+
+static void func() {
+	NSString *s = YES ? [object test:nil
+	                           test2:YES
+	                           test3:nil
+	                           test4:NO] : nil;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50909-3766.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50909-3766.m
new file mode 100644
index 00000000..36b83473
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50909-3766.m
@@ -0,0 +1,15 @@
+void test(NSString *param1, void (^_Nullable completionBlock)(int));
+
+void test(NSString *param1, void (^_Nullable completionBlock)(int));
+
+void test(void (^_Nullable completionBlock)(int), NSString *param1);
+
+void test(void (^_Nullable completionBlock)(int), NSString *param1, void (^_Nullable completionBlock)(int));
+
+void test(
+	void (^_Nullable completionBlock)(int),
+	NSString *param1,
+	void (^_Nullable completionBlock)(int)
+	);
+
+void test(NSString *param1, void (^_Nullable completionBlock)(NSString *, NSString *, void (^_Nullable completionBlock2)(int)));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50910-3767.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50910-3767.mm
new file mode 100644
index 00000000..a7cbb954
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50910-3767.mm
@@ -0,0 +1,7 @@
+const auto test = [=](NSString *param) {};
+const auto test = [&](NSString *param) {};
+const auto test = [](NSString *param) {};
+func([=](NSString *param) {});
+func([&](NSString *param) {});
+func([](NSString *param) {});
+func(param1, [=](NSString *param) {});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50911-3811.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50911-3811.mm
new file mode 100644
index 00000000..4510b8c2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50911-3811.mm
@@ -0,0 +1,6 @@
+int main()
+{
+  test([](enum TestEnum lhs) {
+    return lhs.first < rhs;
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50912-3812.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50912-3812.m
new file mode 100644
index 00000000..acea28c0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50912-3812.m
@@ -0,0 +1,8 @@
+- (int)test
+{
+  [obj method:[obj2 method2:@{}]];
+  switch (var) {
+    case one: return 3;
+  }
+  return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50913-3813.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50913-3813.m
new file mode 100644
index 00000000..37e9239f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50913-3813.m
@@ -0,0 +1,20 @@
+- (void)func {
+  func2(^{
+    switch (type) {
+      case one:
+        break;
+      default:
+        break;
+    }
+  });
+}
+
+- (void)func {
+  func2(^{
+    if(YES) {
+      switch (type) {
+        case one: break;
+      }
+    }
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50914-3819.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50914-3819.m
new file mode 100644
index 00000000..2a34b1c3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50914-3819.m
@@ -0,0 +1 @@
+#if __has_include(<UIKit/UIImage.h>)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50915-3822.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50915-3822.h
new file mode 100644
index 00000000..e0f113e1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50915-3822.h
@@ -0,0 +1,5 @@
+@interface FooInterface : UIViewController
+
+@property (nonatomic, readwrite, weak) id<FooProtocol> delegate;
+
+@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50916-3823.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50916-3823.m
new file mode 100644
index 00000000..9c110935
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50916-3823.m
@@ -0,0 +1,6 @@
+void (^(^complexBlock)(void (^)(void)))(void) = ^(void (^aBlock)(void)) {
+  NSLog(@"Good");
+  return ^{
+    NSLog(@"Nice");
+  };
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51000-sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51000-sp_cond_ternary_short.m
index 6c1ce050..6c1ce050 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51000-sp_cond_ternary_short.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51000-sp_cond_ternary_short.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51001-ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51001-ns_enum-i.m
index e5caad06..e5caad06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51001-ns_enum-i.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51001-ns_enum-i.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51002-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51002-sp_oc_catch.m
index 391b8df8..391b8df8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51002-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51002-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51003-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51003-sp_oc_catch.m
index c214c848..c214c848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51003-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51003-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51004-block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51004-block_pointer.m
index ab51e3d2..ab51e3d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51004-block_pointer.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51004-block_pointer.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/60011-UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/60011-UNI-11095.mm
index 4f88df51..4f88df51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/60011-UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/60011-UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60000-functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60000-functions.pawn
index 853c70ad..853c70ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60000-functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60000-functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60001-comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60001-comment.p
index f63deb62..f63deb62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60001-comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60001-comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60002-traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60002-traffic.p
index a902e497..a902e497 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60002-traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60002-traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60003-tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60003-tags.pawn
index b21f7679..b21f7679 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60003-tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60003-tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60004-enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60004-enum.pawn
index 7dd318f3..7dd318f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60004-enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60004-enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60005-unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60005-unbraced.p
index 1a22a3af..1a22a3af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60005-unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60005-unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60010-str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60010-str-escape.p
index 3aa54453..3aa54453 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60010-str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60010-str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60020-switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60020-switch-vsemi.sma
index a0c720f7..a0c720f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60020-switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60020-switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60030-crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60030-crusty_ex-1.sma
index 23e042dd..23e042dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60030-crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60030-crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60040-preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60040-preproc.pawn
index 6df8101f..6df8101f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60040-preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60040-preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60050-gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60050-gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60050-gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60050-gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60100-Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60100-Issue_2586.pawn
index e3eed47c..e3eed47c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60100-Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60100-Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60101-Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60101-Issue_2665.pawn
index 90fcbd07..90fcbd07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60101-Issue_2665.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60101-Issue_2665.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02400-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02400-mysql.sqc
index ec8ad604..ec8ad604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02400-mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02400-mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02401-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02401-sta-select.sqc
index 1142c3b9..1142c3b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02401-sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02401-sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02402-issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02402-issue_527.sqc
index 17ccfa3b..17ccfa3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02402-issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02402-issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70000-list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70000-list.vala
index 1893dcb5..1893dcb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70000-list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70000-list.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70001-advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70001-advanced.vala
index ca88a821..c1d581c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70001-advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70001-advanced.vala
@@ -10,7 +10,7 @@ public class Sample : Object {
    {
       foo += s => {
          stdout.printf("Lambda expression %s!\n", name);
-      }
+      };
 
       /* Calling lambda expression */
       foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70010-verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70010-verbatim_str.vala
index fb0824ae..12c1f1a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70010-verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70010-verbatim_str.vala
@@ -10,7 +10,7 @@ public class Sample : Object {
    {
       foo += s => {
          stdout.printf("Lambda expression %s!\n", name);
-      }
+      };
 
       /* Calling lambda expression */
       foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70011-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70011-verbatim_str2.vala
index c607d7b4..fc745113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70011-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70011-verbatim_str2.vala
@@ -10,7 +10,7 @@ public class Sample : Object {
    {
       foo += s => {
          stdout.printf("Lambda expression %s!\n", name);
-      }
+      };
 
       /* Calling lambda expression */
       foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70012-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70012-verbatim_str2.vala
index c253b86b..edd0ea67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70012-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70012-verbatim_str2.vala
@@ -10,7 +10,7 @@ public class Sample : Object {
    {
       foo += s => {
          stdout.printf("Lambda expression %s!\n", name);
-      }
+      };
 
       /* Calling lambda expression */
       foo();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70020-preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70020-preproc.vala
index 9cc1ba1a..9cc1ba1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70020-preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70020-preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70287-gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70287-gh287.vala
index be39a9db..be39a9db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70287-gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70287-gh287.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70300-Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70300-Issue_2090.vala
index 5b4e1716..5b4e1716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70300-Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70300-Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70301-Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70301-Issue_2270.vala
index 2202627c..2202627c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70301-Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70301-Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70302-cast.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70302-cast.vala
index 6c5d11db..6c5d11db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70302-cast.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70302-cast.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70303-nullable.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70303-nullable.vala
index 54c24643..54c24643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70303-nullable.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/expected/vala/70304-identifier.vala
new file mode 100644
index 00000000..5dee8d3b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70304-identifier.vala
@@ -0,0 +1,47 @@
+namespace ns
+{
+// You can omit '@' in trivial 'type func-name' definitions.
+void if() {
+}
+void else() {
+}
+void foreach() {
+}
+
+// Numeric identifiers require '@'.
+int @123star() {
+}
+
+// Non-primitive return types require '@'.
+Foo @while() {
+}
+}
+
+public static int main()
+{
+	// You can omit '@' in trivial 'type var;' declarations.
+	int for;
+	int while = 1;
+	int do;
+
+	// Non-primitive types always require '@'.
+	Foo @do;
+
+	// Slightly more complex 'type var_list;' require '@'.
+	int @if, @else, @for, @do, @while;
+
+	// This will complain about missing '(' etc.
+	// int if, else, for, do, while;
+
+	// It is common to omit '@' when accessing methods.
+	ns.if();
+	ns.else();
+	ns.do();
+	ns.while();
+	ns.foreach();
+
+	// Numeric methods always require '@'.
+	ns.@123star();
+
+	return 0;
+}
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.76.0/tests/expected/vala/70310-mdarray_space.vala
new file mode 100644
index 00000000..6fd7c360
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70310-mdarray_space.vala
@@ -0,0 +1,2 @@
+int[ , , ] x;
+var y = new int[2, 3];
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.76.0/tests/expected/vala/70311-mdarray_space.vala
new file mode 100644
index 00000000..c8a51c1e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70311-mdarray_space.vala
@@ -0,0 +1,2 @@
+int[,,] x;
+var y = new int[2, 3];
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.76.0/tests/expected/vala/70312-mdarray_space.vala
new file mode 100644
index 00000000..cf64a5e2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70312-mdarray_space.vala
@@ -0,0 +1,2 @@
+int[, ,] x;
+var y = new int[2, 3];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/fixtest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/fixtest.sh
index 76fac4bf..76fac4bf 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/fixtest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/generate_p_files.sh
new file mode 100755
index 00000000..2327b7c7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/generate_p_files.sh
@@ -0,0 +1,21 @@
+#! /bin/sh
+#
+# Author:  guy maurel
+# May 2022
+#
+# generate p-files from the sources
+#
+# the test is only useful for the developers
+#
+LIST=`ls -1 ../src/*.cpp`
+LIST_H=`ls -1 ../src/*.h`
+P_FILES="../build/P-files"
+#
+mkdir -p ${P_FILES}
+#
+for each in ${LIST} ${LIST_H}
+do
+  bn=`basename ${each}`
+  echo ${bn}
+  uncrustify -q -c ../forUncrustifySources.cfg -f ${each} -o /dev/null -p ${P_FILES}/${bn}-p.txt
+done
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/imported.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/imported.test
index b20f0247..b20f0247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/imported.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/imported.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/1225.c
index c6533cb1..c6533cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue-2278.c
index 1ecfecf5..1ecfecf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue-2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2360.c
index dd4530c7..dd4530c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3169.c
index bf67ca55..bf67ca55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3169.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3169.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3192.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3192.c
index d8fde2a6..d8fde2a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3192.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3192.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3233.c
index 5cfdff8f..5cfdff8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3233.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3233.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3269.c
index 5b7de8e6..5b7de8e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3269.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3269.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3272.h
index 673c5a91..673c5a91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3272.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3272.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3274.c
index f8b9f789..f8b9f789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3274.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3274.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3327.c
index 883c5436..883c5436 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3327.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3327.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3339.c
index 9f445c1a..9f445c1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3342.c
index 986aab70..986aab70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3342.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3342.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3343.c
index 3c21608b..3c21608b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3345.c
index eec63b28..eec63b28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3345.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3345.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3351.c
index 889d731a..889d731a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3351.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3351.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3353.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3353.h
index f189ebfa..f189ebfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3353.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3353.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3356.c
index de2dba21..de2dba21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3356.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3356.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3362.c
index 7a8c08f3..7a8c08f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3366.c
index 769c2f94..769c2f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3366.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3366.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3370.c
index 79081331..79081331 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3370.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3370.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3376.c
index 084e9c7d..084e9c7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3377.c
index 99cb0d84..99cb0d84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3377.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3377.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3402.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3402.c
index 569d5e3a..569d5e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3402.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3402.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3421.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3421.h
index b66478fb..b66478fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3421.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3421.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3431.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3431.c
index b0d9246d..b0d9246d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3431.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3431.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3436.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3436.c
index d921d9ed..d921d9ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3436.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3436.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3454.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3454.c
index 8be230dd..8be230dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3454.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3454.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3457.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3457.c
index e76affa4..e76affa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3457.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3457.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3472.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3472.c
index d180a700..d180a700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3472.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3472.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3476.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3476.c
index 92a7b0c0..92a7b0c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3476.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3476.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3480.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3480.c
index 6a25879a..6a25879a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3480.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3480.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3493.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3493.c
index 66554d57..66554d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3493.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3493.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3496.h
index b0509bd5..b0509bd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/Issue_3506.c
new file mode 100644
index 00000000..30db2976
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3506.c
@@ -0,0 +1,12 @@
+#define CONCAT2x(a,b) a ## _ ## b
+#define CONCAT2(a,b) CONCAT2x(a,b)
+
+typedef struct S {
+int a;
+int b;
+} S;
+
+static const S CONCAT2(foo, bar) = {
+3,
+4
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3516.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3516.c
index 2f591b75..2f591b75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3516.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3516.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3518.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3518.c
index cf8d0c95..cf8d0c95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3518.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3518.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3548.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3548.c
index 71824adc..71824adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3548.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3548.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3556.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3556.c
index 423e07f0..423e07f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3556.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/Issue_3559.c
new file mode 100644
index 00000000..96c73820
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3559.c
@@ -0,0 +1,2 @@
+#define my_thing(stuff) \
+  &object3, &object4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3561.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3561.c
index db5c5afc..db5c5afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3561.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3561.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3565.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3565.c
index 267e25bd..267e25bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3565.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3565.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3567.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3567.c
index e81c7672..e81c7672 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3567.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3567.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3580.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3580.c
index 2b6b7e43..2b6b7e43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3580.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3580.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3582.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3582.c
index ebcc648b..ebcc648b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3582.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3582.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3587.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3587.h
index 3744884f..3744884f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3587.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3587.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3601.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3601.c
index a2b92fa0..a2b92fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3601.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/Issue_3662.c
new file mode 100644
index 00000000..0435608b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3662.c
@@ -0,0 +1,12 @@
+#define emit /* syntactic sugar, like in Qt */
+
+void some_signal(int *x)
+{
+}
+
+int main(void)
+{
+	int x;
+	emit some_signal(&x);
+	return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3873.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3873.c
new file mode 100644
index 00000000..e7c96e83
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3873.c
@@ -0,0 +1 @@
+while(true) { /* hello */ }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/add_long_comment.c
index 5900de52..5900de52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-equ.c
index 374ccbfb..374ccbfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto-vars.c
index e1dd71ff..e1dd71ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto.c
index 64dfce00..64dfce00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-string.c
index f652e88f..f652e88f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-struct-init.c
index 084994ff..084994ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-typedef.c
index ae17eb4d..ae17eb4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-var.c
index adbf8a98..adbf8a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/align_assign_var_defs.c
new file mode 100644
index 00000000..0f25a246
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assign_var_defs.c
@@ -0,0 +1,9 @@
+int foo(void) {
+    unsigned a = 123;
+    unsigned abcde = 456;
+    unsigned abcdefghijklmnop = 789;
+    unsigned w, x, y, z;
+    unsigned u = 16730;
+    unsigned vvvvv = 4917;
+    unsigned wwwwwwwwww = 12428;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assigns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assigns.c
new file mode 100644
index 00000000..e0742dd6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assigns.c
@@ -0,0 +1,43 @@
+unsigned foo(unsigned in1, unsigned in2, unsigned in3, unsigned in4) {
+    unsigned a = 0xa;
+    unsigned b   = 0xb;
+    unsigned c         = 0xc;
+    unsigned x[10] = {0};
+    {
+    unsigned xyz = (
+                    1
+                    +
+                    2
+                    +
+                    3
+                    +
+                    4
+                    +
+                    5
+                    );
+    }
+    unsigned r1 = in1 * in3;
+    unsigned r2first = in1 * in4;
+    unsigned r2second = in2 * in3;
+    unsigned r3 = in2 * in4;
+
+    a ^=
+    b; c += d;
+
+
+
+    a += (
+    b); c += d;
+
+
+
+    a += x[
+    0]; c += d;
+
+
+
+    a += b; {
+    }; c += d;
+
+    return r1 * r2first + r3 * r2second + a * b + c;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_attr.c
index 0f4cfee1..0f4cfee1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_func_proto_star_amp.h
index 17a7c5ce..17a7c5ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_keep_extra.c
index 2bc0f532..2bc0f532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_keep_extra.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_418.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_419.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_416.c
index f4f6606e..f4f6606e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_417.c
index c3c881eb..c3c881eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_stack.c
index 0f88df06..0f88df06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/align_trailing_do_cmt.c
new file mode 100644
index 00000000..372da441
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_trailing_do_cmt.c
@@ -0,0 +1,14 @@
+int foo(void) {
+    int r;
+    do // this comment should be aligned with the one below
+    {
+        r = bar();
+    }
+    while (r);
+
+    do            // this comment should be aligned with the one above
+    {
+        r = baz();
+    }
+    while (r);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/asm.c
index 1fb5015c..1fb5015c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/attribute.c
index babe229f..babe229f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/backslash-newline-lex.c
index 0f20388c..0f20388c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/beautifier-off.c
index 033179cb..033179cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bits.c
index 9a12f484..9a12f484 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bool-pos.c
index d6887223..d6887223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/br_cmt.c
index 4e57d2de..4e57d2de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove.c
index c62506e3..c62506e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove2.c
index e5b73723..e5b73723 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove3.c
index 9cde8bbd..9cde8bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace.c
index 31f3b42b..31f3b42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-2.c
index a34d73d8..a34d73d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-3.c
index 1f1a2066..1f1a2066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-4.c
index 385f4a8e..385f4a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-5.c
index c77cc912..c77cc912 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces.c
index 20733afc..20733afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bsnl.c
index b2b38b8e..b2b38b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1041.c
index 193c750b..193c750b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1702.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_2331.c
index f30c53d3..f30c53d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_3156.c
index 508a0098..508a0098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_3156.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_3156.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_489.c
index e83d351b..e83d351b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_671.c
index 01a3b02b..01a3b02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_771.c
index c933487d..c933487d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_771.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_876.c
index ab2a05db..ab2a05db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-1.c
index 39050c07..39050c07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-3.c
index 4f85044a..4f85044a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-4.c
index e01c2c32..e01c2c32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-5.c
index 626eb7e6..626eb7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-6.c
index 99ebbdda..99ebbdda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-7.c
index a879aa17..a879aa17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-8.c
index 8870a663..8870a663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs.c
index d75a4782..d75a4782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case-nl_before_return.c
index 67adaddd..67adaddd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case.c
index ffceda0e..ffceda0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cast_brace.c
index 7ec7f67a..7ec7f67a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cast_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/casts.c
index f09f5c5e..f09f5c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/clang-has_include.h
index d153e70a..d153e70a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt-align.c
index 658bac4d..658bac4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi.c
index 8e01c5fc..8e01c5fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_nl_end.c
index 48929d07..48929d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_reflow.c
index 6c40e11b..6c40e11b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_reflow.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_reflow.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_right_align.c
index b707f0bb..b707f0bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/code_width.c
index 2262afe3..2262afe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/colon-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/colon-asm.c
index 5125af19..5125af19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/colon-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/colon-asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-convert.c
index 4282ab0b..4282ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-indent.c
index d5295d6e..d5295d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cond.c
index aec2f0a3..aec2f0a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/custom_types_ssl.c
index 0454f81d..0454f81d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/define-if-indent.c
index 1ef47273..1ef47273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/deref.c
index 100464fb..100464fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/directfb.h
index 3531fa21..3531fa21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/dos.c
index 108c3b1c..108c3b1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/double-sparen.c
index e76c3ea1..e76c3ea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/doxy-comment.c
index ef0414ac..ef0414ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/empty-braces.c
new file mode 100644
index 00000000..f1c1ec78
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/empty-braces.c
@@ -0,0 +1,55 @@
+void single_line(int* a, int *b, int * c) {}
+
+void braces_on_newline(int* a, int *b, int * c)
+{}
+
+void braces_on_separate_lines(int* a, int *b, int * c)
+{
+}
+
+void braces_on_multiple_empty_lines(int* a, int *b, int * c)
+{
+
+
+}
+
+int main()
+{
+    for (int i=0; i<10; i++){}
+
+    for (int i=0; i<10; i++){
+    }
+
+    for (int i=0; i<10; i++){
+
+    }
+
+    while (true){}
+
+    while (true){
+    }
+
+    while (true){
+
+    }
+
+
+    do{} while (true);
+
+    do{
+    } while (true);
+
+    do{
+
+    } while (true);
+
+
+    if(true){}
+
+    if(true){
+    }
+
+    if(true){
+
+    }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/empty-for.c
index d9fb686a..d9fb686a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/endif.c
index fd621299..fd621299 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum-struct-init.c
index 6660e4a4..6660e4a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_comma_ifdef.c
index aa80cf48..aa80cf48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_gallery.c
index 2be93194..2be93194 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/extern.c
index 3bcfcbe5..3bcfcbe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent.c
index ff9f812b..ff9f812b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent_func_def_col1.c
index 235731c2..235731c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_type.c
index d49d381d..d49d381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/for-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/for-space.c
index 1064d493..1064d493 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/for-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/for-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/forever.c
index 94dc8ce1..94dc8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/freebsd.c
index c9ef164f..37a17cb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/freebsd.c
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
 		stmt2;
 	}
 
-        almod = (chunk_is_single_line_comment(pc) &&
+        almod = (pc->IsSingleLineComment() &&
                 cpd.settings[UO_indent_relative_single_line_comments].b) ?
             ALMODE_KEEP_REL : ALMODE_KEEP_ABS;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_call_user.c
index 275d8c5e..275d8c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_call_user2.c
index 38ecb232..38ecb232 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/func_var_multi_paren.c
new file mode 100644
index 00000000..aefbde49
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_var_multi_paren.c
@@ -0,0 +1,3 @@
+#define DEFINE_SYMBOL(ret, fn, ...)   ret (*OVERRIDE_SYMBOL(fn))(__VA_ARGS__)
+#define DEFINE_SYMBOL(ret, fn, ...)   ret (*OVERRIDE_SYMBOL(OVERRIDE_SYMBOL2(fn)))(__VA_ARGS__)
+#define DEFINE_SYMBOL(ret, fn, ...)   ret (*OVERRIDE_SYMBOL(fn)())(__VA_ARGS__)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_wrap.c
index 7589d03b..7589d03b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/funcfunc.c
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/function-def.c
index 778d121f..778d121f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/gh399.c
index 00f868a3..00f868a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/global-vars.c
index 9576341b..9576341b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/hello.c
index 5849783c..5849783c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1564.c
index c906ef9b..c906ef9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i2c-core.c
index 29bdb584..29bdb584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/if_chain.c
index 948492dd..948492dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/ifdef-indent.c
index 5043c01f..5043c01f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/ifdef-nest.c
index 68baf1fc..68baf1fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/incdec_postfix_multiply.c
new file mode 100644
index 00000000..51c2b3a3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/incdec_postfix_multiply.c
@@ -0,0 +1 @@
+unsigned result = *var++ * int(0x1111);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include-guard.h
index 03625573..03625573 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include-guard.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include-guard.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include_define.h
index 13380cac..13380cac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-assign.c
index 58ed9c52..58ed9c52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-macro-brace.c
index 8c3f9941..8c3f9941 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-off-after-assign.c
index d01f58c0..d01f58c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-off-after-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-vbrace.c
index 8b48e235..8b48e235 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_first_bool_expr.c
index ec68ac3a..ec68ac3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_ternary-1.c
index b76e375b..b76e375b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_ternary-2.c
index 20f1df64..20f1df64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/infinite-loops.c
new file mode 100644
index 00000000..71d52db7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/infinite-loops.c
@@ -0,0 +1,139 @@
+int main(void)
+{
+	int x;
+
+
+	/* Braces on their own lines */
+
+	for (;;)
+	{
+	}
+
+	while (true)
+	{
+	}
+
+	do
+	{
+	}
+	while (true);
+
+	while (1)
+	{
+	}
+
+	do
+	{
+	}
+	while (1);
+
+
+	/* Braces on the same lines as the keywords */
+
+	for (;;) {
+	}
+
+	while (true) {
+	}
+
+	do {
+	} while (true);
+
+	while (1) {
+	}
+
+	do {
+	} while (1);
+
+
+	/* Braces but everything on one line */
+
+	for (;;) {}
+
+	while (true) {}
+
+	do {} while (true);
+
+	while (1) {}
+
+	do {} while (1);
+
+
+	/* No braces */
+
+	for (;;)
+		x++;
+
+	while (true)
+		x++;
+
+	do
+		x++;
+	while (true);
+
+	while (1)
+		x++;
+
+	do
+		x++;
+	while (1);
+
+
+	/* No braces and everything on one line */
+
+	for (;;) x++;
+
+	while (true) x++;
+
+	do x++; while (true);
+
+	while (1) x++;
+
+	do x++; while (1);
+
+
+	/* Comments near or in loop syntax */
+
+	for (; /*ever*/ ;)
+		x++;
+
+	while (/* always */ 1)
+		x++;
+
+	do
+		x++;
+	while (1) /* without end */;
+
+	/* comment */ for(;;)
+		x++;
+
+	for(;;) // comment
+		x++;
+
+	do // comment
+		x++;
+	while (1); // comment
+
+
+	/* Unusual infinite loop conditions */
+
+	for (; 999 ;)
+		x++;
+
+	while (999)
+		x++;
+
+	do
+		x++;
+	while (999);
+
+	for (; 1 == 1 ;)
+		x++;
+
+	while (1 == 1)
+		x++;
+
+	do
+		x++;
+	while (1 == 1);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/int-types.c
new file mode 100644
index 00000000..72073e28
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/int-types.c
@@ -0,0 +1,58 @@
+int int_var;
+
+short short_var;
+short int short_int_var;
+int short int_short_var;
+
+long long_var;
+long int long_int_var;
+int long int_long_var;
+
+long long long_long_var;
+long long int long_long_int_var;
+int long long int_long_long_var;
+long int long long_int_long_var;
+
+signed signed_var;
+signed int signed_int_var;
+int signed int_signed_var;
+
+unsigned unsigned_var;
+unsigned int unsigned_int_var;
+int unsigned int_unsigned_var;
+
+short /* comment */ short_comment_var;
+short /* comment */ int short_comment_int_var;
+
+const long const_long_var;
+long const long_const_var;
+
+unsigned long unsigned_long_var;
+long unsigned long_unsigned_var;
+
+unsigned const long unsigned_const_long_var;
+unsigned const long int unsigned_const_long_int_var;
+
+const long int const_long_int_var;
+const int long const_int_long_var;
+long const int long_const_int_var;
+long int const long_int_const_var;
+int const long int_const_long_var;
+int long const int_long_const_var;
+
+unsigned long int unsigned_long_int_var;
+unsigned int long unsigned_int_long_var;
+long unsigned int long_unsigned_int_var;
+long int unsigned long_int_unsigned_var;
+int unsigned long int_unsigned_long_var;
+int long unsigned unsigned_long_int_var;
+
+char char_var;
+signed char signed_char_var;
+char signed char_signed_var;
+unsigned char unsigned_char_var;
+char unsigned char_unsigned_var;
+
+double double_var;
+long double long_double_var;
+double long double_long_var;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/kw_subst.c
index 5d37f823..5d37f823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/lvalue.c
index 2f2cc17d..2f2cc17d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/lvalue.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mac.c
index ce4e7937..ce4e7937 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/macro-returns.c
index 0febb263..0febb263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/minus-minus.c
index 4eb69237..4eb69237 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/minus-minus.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/misc.c
index cd948007..cd948007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod-paren.c
index 14bb9836..14bb9836 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_case_brace.c
index 4bd9abde..4bd9abde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_move_case_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return.c
index 38dd6a62..38dd6a62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_move_case_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_move_case_return_bad.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return_bad.c
index 95d3fb09..95d3fb09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_move_case_return_bad.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return_bad.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/multi.h
index 33acea34..33acea34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/my_infile.c
index 8b8cd113..8b8cd113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-comment.c
index 70c49200..70c49200 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont.c
index 9f87950f..9f87950f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont2.c
index b3f079e3..b3f079e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-semicolon.c
index 8e0f59d3..8e0f59d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-semicolon.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-ver-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-ver-def.c
index 9684ed27..9684ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-ver-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-ver-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_assign.c
index b2495c13..b2495c13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_ignore_after_case.c
index 51866fe4..51866fe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_ignore_after_case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_ignore_after_case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_return.c
index da5ed3eb..da5ed3eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_create_one_liner.c
index 16887eca..16887eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_ds_struct_enum.c
index d19964ae..d19964ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_endif.c
index d738d74a..d738d74a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/nl_func_call.c
new file mode 100644
index 00000000..7af891a1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_func_call.c
@@ -0,0 +1,81 @@
+void example(int a, int b, int c, int d);
+void example2(void);
+void userfunc(int w, int x, int y, int z);
+
+int main(void) {
+    example(1, 2, 3, 4);
+
+    example(1, 2,
+            3, 4);
+
+    example(
+            1,
+            2,
+            3, 4);
+
+    example(
+            1,
+            2,
+            3, 4
+            );
+
+    example
+        (1, 2, 3, 4);
+
+    example
+        (
+            1,
+            2,
+            3, 4);
+
+    example
+        (
+            1,
+            2,
+            3, 4
+         );
+
+    example2();
+
+    example2(
+             );
+
+    example2
+        ();
+
+    example2
+        (
+             );
+
+    userfunc(1, 2, 3, 4);
+
+    userfunc(1, 2,
+            3, 4);
+
+    userfunc(
+            1,
+            2,
+            3, 4);
+
+    userfunc(
+            1,
+            2,
+            3, 4
+            );
+
+    userfunc
+        (1, 2, 3, 4);
+
+    userfunc
+        (
+            1,
+            2,
+            3, 4);
+
+    userfunc
+        (
+            1,
+            2,
+            3, 4
+         );
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_return_expr.c
index e917e399..e917e399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-define.c
index fdb02e31..fdb02e31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-init.c
index 91d92d55..91d92d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one_liners.c
index 1f6e0d3e..1f6e0d3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one_liners.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one_liners.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren-indent.c
index df5b1c14..df5b1c14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren_indent.c
index 4b0ff447..4b0ff447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/parenthesized_indirect_call.c
index 3d5a6819..3d5a6819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/parenthesized_indirect_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/parenthesized_indirect_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pascal_ptr.c
index 5b0116ba..5b0116ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_compare.c
index b0942de0..b0942de0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_conditional.c
index 100545e5..100545e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-if-indent.c
index cd9d6c4d..cd9d6c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-nest.c
index b602471b..b602471b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-space.c
index 67cf3e55..67cf3e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_concat_asn1.h
index 9874cf04..9874cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp_concat_asn1.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/pp_indent_with_tabs.c
new file mode 100644
index 00000000..d32c568d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_indent_with_tabs.c
@@ -0,0 +1,167 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+int main()
+{
+	if (true)
+	{
+		if (true)
+		{
+			if (true)
+			{
+				if (true)
+				{
+					if (true)
+					{
+						int i = 0;
+					}
+				}
+			}
+		}
+	}
+}
+
+#ifndef OPEN_MAX
+#ifdef SVR4
+#define OPEN_MAX 256
+#else
+#include <sys/param.h>
+#ifndef OPEN_MAX
+#if defined(__OSF1__) || defined(__osf__)
+#define OPEN_MAX 256
+#else
+#ifdef NOFILE
+#define OPEN_MAX NOFILE
+#else
+#if !defined(__EMX__) && !defined(__QNX__)
+#define OPEN_MAX NOFILES_MAX
+#else
+#define OPEN_MAX 256
+#ifdef NOFILE
+#define OPEN_MAX NOFILE
+#else
+#define OPEN_MAX 256
+#ifdef NOFILE
+#define OPEN_MAX NOFILE
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+
+#ifndef __EMX__
+#define XTRANSDEBUG 1
+#else
+#define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+#define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+#include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int  errno;		/* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+#ifndef MINIX
+#ifndef Lynx
+#include <sys/socket.h>
+#else
+#include <socket.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+#ifdef __EMX__
+#include <sys/ioctl.h>
+#endif
+
+#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+#ifndef NEED_UTSNAME
+#define NEED_UTSNAME
+#endif
+#include <sys/utsname.h>
+#endif
+
+#ifndef TRANS_OPEN_MAX
+
+#ifndef X_NOT_POSIX
+#ifdef _POSIX_SOURCE
+#include <limits.h>
+#else
+#define _POSIX_SOURCE
+#include <limits.h>
+#undef _POSIX_SOURCE
+#endif
+#endif
+#ifndef OPEN_MAX
+#ifdef __GNU__
+#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+#endif
+#ifdef SVR4
+#define OPEN_MAX 256
+#else
+#include <sys/param.h>
+#ifndef OPEN_MAX
+#if defined(__OSF1__) || defined(__osf__)
+#define OPEN_MAX 256
+#else
+#ifdef NOFILE
+#define OPEN_MAX NOFILE
+#else
+#if !defined(__EMX__) && !defined(__QNX__)
+#define OPEN_MAX NOFILES_MAX
+#else
+#define OPEN_MAX 256
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#ifdef __GNU__
+#define TRANS_OPEN_MAX OPEN_MAX
+#elif OPEN_MAX > 256
+#define TRANS_OPEN_MAX 256
+#else
+#define TRANS_OPEN_MAX OPEN_MAX
+#endif /*__GNU__*/
+
+#endif /* TRANS_OPEN_MAX */
+
+#ifdef __EMX__
+#define ESET(val)
+#else
+#define ESET(val) errno = val
+#endif
+#define EGET() errno
+
+#else /* _WIN32 */
+
+#include <limits.h>	/* for USHRT_MAX */
+
+#define ESET(val) WSASetLastError(val)
+#define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifdef X11_t
+#define X_TCP_PORT	6000
+#endif
+
+#endif
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.76.0/tests/input/c/pp_multiline_define.c
new file mode 100644
index 00000000..3ac9db6b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_multiline_define.c
@@ -0,0 +1,68 @@
+#define gettext(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.75.0/tests/input/c/pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_ret.c
index c35e4294..c35e4294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/pp_space_before_after.c
new file mode 100644
index 00000000..3f801dc7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_space_before_after.c
@@ -0,0 +1,116 @@
+#ifndef _XTRANSINT_H_
+#define _XTRANSINT_H_
+
+#ifndef __EMX__
+#  define XTRANSDEBUG 1
+#else
+#define XTRANSDEBUG 1
+#endif
+
+#ifdef _WIN32
+#define _WILLWINSOCK_
+#endif
+
+#include "Xtrans.h"
+
+#ifdef XTRANSDEBUG
+#include <stdio.h>
+#endif /* XTRANSDEBUG */
+
+#include <errno.h>
+#ifdef X_NOT_STDC_ENV
+extern int  errno;		/* Internal system error number. */
+#endif
+
+#ifndef _WIN32
+#ifndef MINIX
+#ifndef Lynx
+#include <sys/socket.h>
+#else
+#include <socket.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+#ifdef __EMX__
+#include <sys/ioctl.h>
+#endif
+
+#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO)
+#ifndef NEED_UTSNAME
+#define NEED_UTSNAME
+#endif
+#include <sys/utsname.h>
+#endif
+
+#ifndef TRANS_OPEN_MAX
+
+#ifndef X_NOT_POSIX
+#ifdef _POSIX_SOURCE
+#include <limits.h>
+#else
+#define _POSIX_SOURCE
+#include <limits.h>
+#undef _POSIX_SOURCE
+#endif
+#endif
+#ifndef OPEN_MAX
+#ifdef __GNU__
+#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+#endif
+#ifdef SVR4
+#define OPEN_MAX 256
+#else
+#include <sys/param.h>
+#ifndef OPEN_MAX
+#if defined(__OSF1__) || defined(__osf__)
+#define OPEN_MAX 256
+#else
+#ifdef NOFILE
+#define OPEN_MAX NOFILE
+#else
+#if !defined(__EMX__) && !defined(__QNX__)
+#define OPEN_MAX NOFILES_MAX
+#else
+#define OPEN_MAX 256
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#ifdef __GNU__
+#define TRANS_OPEN_MAX OPEN_MAX
+#elif OPEN_MAX > 256
+#define TRANS_OPEN_MAX 256
+#else
+#define TRANS_OPEN_MAX OPEN_MAX
+#endif /*__GNU__*/
+
+#endif /* TRANS_OPEN_MAX */
+
+#ifdef __EMX__
+#define ESET(val)
+#else
+#define ESET(val) errno = val
+#endif
+#define EGET() errno
+
+#else /* _WIN32 */
+
+#include <limits.h>	/* for USHRT_MAX */
+
+#define ESET(val) WSASetLastError(val)
+#define EGET() WSAGetLastError()
+
+#endif /* _WIN32 */
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifdef X11_t
+#define X_TCP_PORT	6000
+#endif
+
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma.c
index a0dcd975..a0dcd975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma_asm.c
index a7834613..a7834613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/preproc-if.c
index 71fbf792..71fbf792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-compound-literal.c
index 8547c3a7..8547c3a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-multi.c
index 846ca21c..846ca21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/semicolons.c
index d7e2379a..d7e2379a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf594.c
index cd08cce6..cd08cce6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/single_line_comment_after.c
index 527b3e80..527b3e80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/single_line_comment_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/single_line_comment_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sort_include.c
index 0f1956d2..0f1956d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_after_sparen.c
index 8a86dd25..8a86dd25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_after_sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_cmt_cpp_start.c
index b9b07287..b9b07287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_embed_comment.c
index 88a54dff..88a54dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_func_call_user_inside_fparen.c
index ba921b9f..ba921b9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sparen-indent.c
index fe770681..fe770681 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/star-style.c
new file mode 100644
index 00000000..aab9ccec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/star-style.c
@@ -0,0 +1,81 @@
+//          gap ↘ |123456| ↙ gap
+static int *a;
+static unsigned int **b;
+static short int *c;
+static long int d;
+static int ***e;
+//          gap ↗ |123456| ↖ gap
+
+//                                gap ↘ |12345678| ↙ gap
+int function_with_no_star_parameters (int parameter)
+//                                gap ↗ |12345678| ↖ gap
+{
+        return 0;
+}
+
+//                           gap ↘ |12345678| ↙ gap
+int function_with_stars(int *f,
+                        unsigned int **g,
+                        short int *h,
+                        long int i,
+                        int ***j)
+//                           gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+        int *k;
+        unsigned int **l;
+        short int *m;
+        long int n;
+        int ***o;
+//           gap ↗ |123456| ↖ gap
+        return 0;
+}
+
+//                                            gap ↘ |12345678| ↙ gap
+int function_closer_than_16_lines_from_j(int *p,
+                                         unsigned int **q,
+                                         short int *r,
+                                         long int s,
+                                         int ***t)
+//                                            gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+        int *u;
+        unsigned int **v;
+        short int *w;
+        long int x;
+        int ***y;
+//           gap ↗ |123456| ↖ gap
+
+        /* The point of this comment is merely to make the
+         * function longer than 16 lines.
+         *
+         * We're doing this to show that parameter alignment is
+         * per parameter list, and that parameter lists from
+         * multiple functions aren't lined up with each other.
+         *
+         * You can see that by noticing that function_with_stars and this
+         * function don't have parameter lists aligned with each
+         * other, and this function and the function below it are
+         * too far away anyway.
+         */
+        return 0;
+}
+
+//                                 gap ↘ |12345678| ↙ gap
+int more_than_16_lines_from_t(int *z,
+                              unsigned int **zz,
+                              short int *zzz,
+                              long int zzzz,
+                              int ***zzzzz)
+//                                 gap ↗ |12345678| ↖ gap
+{
+//           gap ↘ |123456| ↙ gap
+        int *zzzzzz;
+        unsigned int **zzzzzzz;
+        short int *zzzzzzzz;
+        long int zzzzzzzzz;
+        int ***zzzzzzzzzz;
+//           gap ↗ |123456| ↖ gap
+        return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/struct-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/struct-brace.c
index 7d08b4ca..7d08b4ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/struct-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/struct-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch-case.c
index add9fcfa..add9fcfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch.c
index 5b760363..5b760363 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/t3.in.c
index e352f736..e352f736 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type-cast.c
index 5760b466..5760b466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type_wrap.c
index 13b74455..13b74455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/utf8-identifiers.c
index e3281aac..e3281aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vardefcol.c
index bdb40e8f..bdb40e8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vardefcol.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/various_colons.c
index 516a5a72..516a5a72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-do.c
index 1cefd1df..1cefd1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-pp.c
index 5ea209c5..5ea209c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-while.c
index 22291748..22291748 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/c/vbrace_one_liner.c
new file mode 100644
index 00000000..5db805a7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vbrace_one_liner.c
@@ -0,0 +1,9 @@
+unsigned a;
+
+int foo(void) {
+    if (a == 1) printf("It's 1\n");
+}
+
+int bar(void) {
+    if (a == 2) printf("It's 2\n");  /* comment */
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/whole_file_ifdef.c
index bb16e116..bb16e116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/xml.c
index fe7afdf4..fe7afdf4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2138.cpp
index e0379b43..e0379b43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2203.cpp
index 4a2c05fa..4a2c05fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/622_ifdef-indentation.cpp
index a6aface7..a6aface7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/623_caret-spacing.cpp
index ad1ed6f7..ad1ed6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/633_decl-in-func-typedef.cpp
index 4e18c597..4e18c597 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DefaultAndDelete.cpp
index 3c4f3b9e..3c4f3b9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DoxygenComments.cpp
index dfa5a906..dfa5a906 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Example.h
index deede79a..deede79a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-1.cpp
index 365df31f..365df31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-2.cpp
index c3765ce4..c3765ce4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-3.cpp
index 6c48cb63..6c48cb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2103.cpp
index c35fbe56..c35fbe56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2103.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1052.cpp
index 19461b71..19461b71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1167.cpp
index 6a9042c2..6a9042c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1184.cpp
index 7c69e7fb..7c69e7fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1692.cpp
index 4a2c97b5..4a2c97b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1703.cpp
index bca40664..bca40664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1737.cpp
index fd8b1384..fd8b1384 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1753.cpp
index bf5530c3..bf5530c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-2.cpp
index 9c02605a..9c02605a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-3.cpp
index 93e0799c..93e0799c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813.cpp
index 0c07555d..0c07555d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1923.cpp
index e5b3ceeb..e5b3ceeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1923.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1966.cpp
index 80b7ddc7..80b7ddc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2020.cpp
index 94d0aa28..94d0aa28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2045.cpp
index 627eba3f..627eba3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2138.cpp
index ad53fa57..ad53fa57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2149.cpp
index 88fb2249..88fb2249 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2151.cpp
index dce02df3..dce02df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2163.cpp
index 543b9827..543b9827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2170.cpp
index beeffc7e..beeffc7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2186.cpp
index c9cbacda..c9cbacda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2195.cpp
index 3573b20d..3573b20d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2219.cpp
index cb6e24bf..cb6e24bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2224.cpp
index 65382eb9..65382eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2229.cpp
index 9f575dc1..9f575dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2232.cpp
index 7632ed27..7632ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2236.cpp
index 5dbc4fbe..5dbc4fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2281.cpp
index 44b9e75f..44b9e75f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2302.cpp
index 4763c574..4763c574 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2305.cpp
index 1b35ac11..1b35ac11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2343.cpp
index 837b0506..837b0506 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-4.cpp
index 9478d63e..9478d63e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2368.cpp
index 08d0556b..08d0556b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2387.cpp
index af00e16e..af00e16e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2428.cpp
index c919d5a5..c919d5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2437.cpp
index 2a64bd8f..2a64bd8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2478.cpp
index fbcfec1f..fbcfec1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2561.cpp
index 15232fc4..15232fc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2574.cpp
index fc79cd0d..fc79cd0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2594.cpp
index 798a719a..798a719a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2604.cpp
index e73c67a8..e73c67a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2668.cpp
index 1e2f5d02..1e2f5d02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2688.cpp
index 0b394620..0b394620 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2688.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2688.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2689.cpp
index ef3b5a4b..ef3b5a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2692.cpp
index 4173ad5d..4173ad5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2726.cpp
index 7b76eb43..7b76eb43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2734.cpp
index 7b85c0ec..7b85c0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2735.cpp
index f83e3536..f83e3536 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2742.cpp
index 9d76fe44..9d76fe44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2742.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2742.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2752.cpp
index 237c8ce1..237c8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2757.cpp
index 3c84969b..3c84969b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2758.cpp
index 1ac9a86e..1ac9a86e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2759.cpp
index cbe9c4a5..cbe9c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2759.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2759.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2794.cpp
index 03f2ae4c..03f2ae4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2794.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2794.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2823.cpp
index eb0228c9..eb0228c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2823.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2823.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2831.cpp
index f2dc1717..f2dc1717 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2836.cpp
index 44272d56..44272d56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2836.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2836.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2873.cpp
index af3020d3..af3020d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2879.cpp
index 294c5e85..294c5e85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2886.cpp
index 0474c710..0474c710 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2886.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2886.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2890.cpp
index cea47724..cea47724 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2907.cpp
index 9d42a72d..9d42a72d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2921.cpp
index 43e19e96..43e19e96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2930.cpp
index 9b130982..9b130982 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2942.cpp
index e5bc781f..e5bc781f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2949.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2957.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2957.cpp
index abb52b72..abb52b72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2957.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2957.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2971.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2971.cpp
index 52e7a253..52e7a253 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2971.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2971.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3010.cpp
index b546e7be..b546e7be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3010.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3010.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3018.cpp
index ddbb473e..ddbb473e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3018.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3018.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3025.cpp
index 9e64526e..9e64526e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3025.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3025.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3034.cpp
index b91f431d..b91f431d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3034.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3034.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3040.cpp
index fe9aed25..fe9aed25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3040.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3040.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3044.cpp
index 739b1305..739b1305 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3044.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3044.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3048.cpp
index 678d6ce4..678d6ce4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3048.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3048.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3052.cpp
index cb468be3..cb468be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054-2.cpp
index 77d0d337..77d0d337 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054.cpp
index 2d8b38d0..2d8b38d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055-a.cpp
index 85c9b7e8..85c9b7e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055.cpp
index 4d66bbf3..4d66bbf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3058.cpp
index f94e88e7..f94e88e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3058.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3058.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_0nl.cpp
index 2a76b5a3..2a76b5a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_1nl.cpp
index fd369e24..fd369e24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_2nl.cpp
index 25906e08..25906e08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3080.cpp
index 75c6072b..75c6072b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3080.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3080.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3097.cpp
index 3959e85a..3959e85a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3097.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3097.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3113.cpp
index 63090f4a..63090f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3113.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3113.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3164.cpp
index 79fd6508..79fd6508 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3164.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3164.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3176.cpp
index 2384027d..2384027d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3176.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3176.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3197.h
index f1ba44b5..f1ba44b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3197.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3197.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3198.cpp
index 8dd234b7..8dd234b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3198.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3198.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3203.cpp
index 47b37eee..47b37eee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3205.cpp
index 99767289..99767289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3205.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3205.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3220.cpp
index ba42b013..ba42b013 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3237.cpp
index 17e84d9c..17e84d9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3237.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3237.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3252.cpp
index b435f4e2..b435f4e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3252.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3252.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3283.cpp
index 9357b3b3..9357b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3284.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3284.cpp
index cea9091e..cea9091e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3284.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3284.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3294.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3294.cpp
index e1bf0e87..e1bf0e87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3294.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3294.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3309.cpp
index d6dd1dac..d6dd1dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3316.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3316.cpp
index ee644d21..ee644d21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3316.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3316.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3321.h
index 8e74beb2..8e74beb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3321.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3321.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3357.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3357.cpp
index f94d17fe..f94d17fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3357.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3357.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3409.cpp
index ac6e64bf..ac6e64bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3413.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3413.cpp
index 80ec8cbc..80ec8cbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3413.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3413.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3422.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3422.cpp
index 015d93f4..015d93f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3422.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3422.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3428.cpp
index e4f45a1c..e4f45a1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3446.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3446.cpp
index 6332b0ad..6332b0ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3446.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3446.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3448.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3448.cpp
index 8dc80497..8dc80497 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3448.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3448.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3505.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3505.cpp
index bb9bcee5..bb9bcee5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3505.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3505.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3513-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-0.cpp
index 51f07966..51f07966 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3513-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3513-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-1.cpp
index 020cc496..020cc496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3513-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3536.cpp
index d068dd96..d068dd96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3538.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3538.cpp
index b965cb12..b965cb12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3538.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3538.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3546.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3546.cpp
index 617e849f..617e849f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3546.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/Issue_3550.cpp
new file mode 100644
index 00000000..bf43f50e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3550.cpp
@@ -0,0 +1,9 @@
+void foo(a, b)

+{

+	bool called = false;

+

+	auto callback = [&](float value)

+	{

+		called = true;

+	};

+}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3552.cpp
index f3baae42..f3baae42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/Issue_3558.cpp
new file mode 100644
index 00000000..561821ee
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3558.cpp
@@ -0,0 +1,4 @@
+int main()
+{
+        return foo ? foo : bar & mask;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3570.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3570.h
index 363447e7..363447e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3570.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3570.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3576.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3576.h
index 9f668b6d..9f668b6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3576.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3576.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3604.cpp
index a96b3437..a96b3437 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3691.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3691.h
new file mode 100644
index 00000000..fb1ec761
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3691.h
@@ -0,0 +1 @@
+void test(std::function<void(const int&)> func);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3710.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3710.cpp
new file mode 100644
index 00000000..4c31fe90
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3710.cpp
@@ -0,0 +1,4 @@
+void foo()
+{
+  PyErr_SetString( PyExc_KeyError, sstr.str().c_str() );
+}                                                       
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3761.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3761.cpp
new file mode 100644
index 00000000..b3f8cbb5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3761.cpp
@@ -0,0 +1,14 @@
+void f(void (*g)())
+{
+}
+
+int main()
+{
+	f([]() {
+		int x = 1;
+		switch (x) {
+		case 1:
+			break;
+		}
+	});
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3785.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3785.cpp
new file mode 100644
index 00000000..90d4b28c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3785.cpp
@@ -0,0 +1,24 @@
+void output_text(FILE *pfile)
+{
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
+   {
+      if (pc->GetTrackingData() != nullptr)
+      {
+         if (many > 1)
+         {
+         }
+#define \
+   EXTRA_LOG_2
+         char *old_one = nullptr;
+      }
+   }
+} // output_text
+
+
+void dump_step(const char *filename, const char *step_description)
+{
+   static     int     file_num = 0;
+     char         buffer[256];
+       FILE             *dump_file;
+   fclose(dump_file);
+} // dump_step
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3786.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3786.cpp
new file mode 100644
index 00000000..ea830d4a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3786.cpp
@@ -0,0 +1,4 @@
+unsigned char wow[][2] = {
+        {0,24,},
+        {152,1,},
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863.cpp
new file mode 100644
index 00000000..4163ee8e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863.cpp
@@ -0,0 +1,3 @@
+void MyClass::myFn()

+{

+}
\ No newline at end of file
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.76.0/tests/input/cpp/Issue_3863_2.cpp
new file mode 100644
index 00000000..f91c6547
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863_2.cpp
@@ -0,0 +1,3 @@
+void MyClass::myFn()

+{

+}

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.76.0/tests/input/cpp/Issue_3863_3.cpp
new file mode 100644
index 00000000..f2885f39
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863_3.cpp
@@ -0,0 +1,4 @@
+void MyClass::myFn()

+{

+}

+

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_750.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_750.cpp
index 461e79ac..461e79ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_750.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_750.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_931.cpp
index 90084874..90084874 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_995-do.cpp
index 05eca611..05eca611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine0.cpp
index 01e7cc97..01e7cc97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
index b0e13d6a..b0e13d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_2.cpp
index ee6239f9..ee6239f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREACH.cpp
index 37156618..37156618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREVER.cpp
index a0fb07d5..a0fb07d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
index 5a4c8e7d..5a4c8e7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Timestamp.h
index 60dc3791..60dc3791 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-10496.cpp
index 3228cf2a..3228cf2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-12046.cpp
index 9cc7b13f..9cc7b13f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1288.cpp
index 38ded76c..38ded76c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1334.cpp
index 278cd1a2..278cd1a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1335.cpp
index 2f3ad2a2..2f3ad2a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1340.cpp
index 2f743294..2f743294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1344.cpp
index c898df76..c898df76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1346.cpp
index 0261a306..0261a306 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1347.cpp
index ac2184f0..ac2184f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1356.cpp
index 8a1aab54..8a1aab54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1358.cpp
index 770bf0c1..770bf0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18439.cpp
index 0c40e831..0c40e831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1981.cpp
index a20f4c43..a20f4c43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-19894.cpp
index ef5fe7cf..ef5fe7cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2049.cpp
index 7c64f76a..7c64f76a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2683.cpp
index 5da60d3f..5da60d3f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-29935.cpp
index a6cf3fc5..a6cf3fc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-29935.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-29935.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-32657.cpp
index 9151231a..9151231a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-9650.cpp
index f6dba01b..f6dba01b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/al.cpp
index 3c232dec..3c232dec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-330.cpp
index 0ba91720..0ba91720 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-assign-mixed.cpp
index 2e55d59d..2e55d59d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-star-amp-pos.cpp
index 29a7a23a..29a7a23a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_across_braces.cpp
index f47f0c80..f47f0c80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_assign_func_proto.cpp
index 0c816099..0c816099 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
index 4b325b1e..4b325b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class-constr.cpp
index 2be3c8e8..2be3c8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class.cpp
index d47e77bb..d47e77bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_constr.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_default_after_override.cpp
index de21686c..de21686c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_fcall.cpp
index c27ed9d1..c27ed9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_params.cpp
index a90155fd..a90155fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh.cpp
index df6b4dca..df6b4dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh2.cpp
index b0960a11..b0960a11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift.cpp
index 3cf7a744..3cf7a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift2.cpp
index c90ae71f..c90ae71f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_var_def_thresh.cpp
index 3942f227..3942f227 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/alt_tokens.cpp
index fcaf1392..fcaf1392 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/anonymous_enum.cpp
index 0cf8426d..0cf8426d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/anonymous_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/arith_vs_byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/arith_vs_byref.cpp
index f459fdcc..f459fdcc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/arith_vs_byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/asm_block_pp.cpp
new file mode 100644
index 00000000..e6816d9a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/asm_block_pp.cpp
@@ -0,0 +1,20 @@
+
+void add128( uint64_t & rlo, uint64_t & rhi, uint64_t addlo ) {
+#if defined(HAVE_X86_64_ASM)
+  __asm__ ("addq %2, %0\n"
+           "adcq $0, %1\n"
+#if defined(__clang__)
+             // clang cannot work properly with "g" and silently
+             // produces hardly-workging code, if "g" is specified;
+           : "+r" (rlo), "+r" (rhi)
+           : "m" (addlo)
+#else
+           : "+g" (rlo), "+g" (rhi)
+           : "g" (addlo)
+#endif
+    );
+#else
+    rlo += addlo;
+    rhi += (rlo < addlo);
+#endif
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/attribute_specifier_seqs.cpp
index 744b3404..744b3404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/av.h
index 7a90197c..7a90197c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bit-colon.cpp
index b593255b..b593255b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bool.cpp
index 30d4cb29..30d4cb29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/brace_brace_init_lst.cpp
index 2a5254f0..2a5254f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/brace_init_stdint_macros.cpp
new file mode 100644
index 00000000..59eb8897
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/brace_init_stdint_macros.cpp
@@ -0,0 +1,7 @@
+#include <stdint.h>
+
+uint64_t values[12] = {
+    UINT64_C(1486918591), UINT64_C(28100), ~UINT64_C(4), UINT64_C(0x2700f184), UINT64_C(0x69b88dcc4d7e98eb), UINT64_C(0x0ab8e2a231b49732),
+    UINT64_C(0x8226beae36e7317e), UINT64_C(0x5739289992c21658), UINT64_C(0x3acce043), ~UINT64_C(8), UINT64_C(4022), UINT64_C(63365009),
+};
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_list.cpp
index e245f34c..e245f34c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_template_decltype.cpp
index bfd5ef86..bfd5ef86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_align.cpp
index ca99edc6..ca99edc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_empty.cpp
index 583c7fa1..583c7fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1001.cpp
index b0ce9a06..b0ce9a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1002.cpp
index 713018e4..713018e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1004.cpp
index 3287be1c..3287be1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1020.cpp
index ec80e915..ec80e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1112.cpp
index e6537641..e6537641 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1127.cpp
index 9ee98743..9ee98743 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/bug_1139.cpp
new file mode 100644
index 00000000..82210d96
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1139.cpp
@@ -0,0 +1,42 @@
+void a()
+{
+               if((tmp == nullptr) ||
+                        ((tmp->GetType() != CT_NUMBER) &&
+                         (tmp->GetType() != CT_SIZEOF) &&
+                         !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+                        (tmp->GetType() == CT_NEWLINE)
+                        )
+               {
+                  next->SetType(CT_LABEL_COLON);
+               }
+else if ((tmp == nullptr) ||
+                        ((tmp->GetType() != CT_NUMBER) &&
+                         (tmp->GetType() != CT_SIZEOF) &&
+                         !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+                        (tmp->GetType() == CT_NEWLINE)
+                        )
+               {
+                  next->SetType(CT_LABEL_COLON);
+               }
+
+
+   if                 ((tmp == nullptr) ||
+       ((tmp->GetType() != CT_NUMBER) &&
+        (tmp->GetType() != CT_SIZEOF) &&
+        !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+          (tmp->GetType() == CT_NEWLINE))
+   {
+      next->SetType(CT_LABEL_COLON);
+   }
+
+   if                 ((tmp == nullptr) ||
+       ((tmp->GetType() != CT_NUMBER) &&
+        (tmp->GetType() != CT_SIZEOF) &&
+        !(tmp->GetFlags() & (PCF_IN_STRUCT | PCF_IN_CLASS))) ||
+          (tmp->GetType() == CT_NEWLINE)
+
+)
+   {
+      next->SetType(CT_LABEL_COLON);
+   }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1158.cpp
index e92da160..e92da160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1161.cpp
index 535c3be7..535c3be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1169.cpp
index aa56008a..aa56008a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1170.cpp
index 35dd772f..35dd772f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1249.cpp
index 975dc82c..975dc82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1288.cpp
index 94444cf9..94444cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1296.cpp
index e2cd65fb..e2cd65fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1315.cpp
index 080c9233..080c9233 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1321.cpp
index c381f91c..c381f91c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1324.cpp
index 5df154f3..5df154f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1340.cpp
index 680d6d51..680d6d51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1346.h
index 21fe1c44..21fe1c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1349.cpp
index aa1938e8..aa1938e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1395.cpp
index 00694ce9..00694ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1402.cpp
index 9b001a44..9b001a44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1403.cpp
index 71f67f75..71f67f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1452.cpp
index d7fcf753..d7fcf753 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1462.cpp
index 5170b9a9..5170b9a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1462.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1462.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1649.cpp
index 4ab5eea8..4ab5eea8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1689.cpp
index 795bb572..795bb572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1691.cpp
index 2d5d1204..2d5d1204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1717.cpp
index a1adcf5f..a1adcf5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758-f.cpp
index b324fbda..b324fbda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1862.cpp
index 78958bb1..78958bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2285.cpp
index 14a85090..14a85090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2322.cpp
index f9768c40..f9768c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2371.cpp
index 26444ad3..26444ad3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2402.cpp
index 92731c19..92731c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_1.cpp
index d19718f5..d19718f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_2.cpp
index 9da12944..9da12944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_472.cpp
index 753d9519..753d9519 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_481.cpp
index 03c4a828..03c4a828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_484.cpp
index 4c582e86..4c582e86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_485.cpp
index 4865da64..4865da64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_488.cpp
index 382beced..382beced 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_495.cpp
index f356c302..f356c302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_612.cpp
index 38253f15..38253f15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_651.cpp
index b36e182a..b36e182a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_654.cpp
index 8baaeb1c..8baaeb1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_657.cpp
index 230b96b3..230b96b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_662.cpp
index f8b0f8a8..f8b0f8a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_663.cpp
index 869320c0..869320c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_664.cpp
index 148201b0..148201b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.cpp
index e9229a8e..e9229a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.h
index ea503b10..ea503b10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_671.h
index 8ff7bfca..8ff7bfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_858.cpp
index 512d2e45..512d2e45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_902.cpp
index eb51f587..eb51f587 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_1000.cpp
index 06da6b3e..06da6b3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_322.cpp
index bc7e687f..bc7e687f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_323.cpp
index ea141156..ea141156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_359.cpp
index 294e3afb..294e3afb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_409.cpp
index b3b51488..b3b51488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_411.cpp
index 647570f2..647570f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_478.cpp
index 5a16eccc..5a16eccc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_481.cpp
index 2a4e6b8f..2a4e6b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_503.cpp
index 3c5951a8..3c5951a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_512.cpp
index 3b4de434..3b4de434 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_525.cpp
index d0773475..d0773475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_568.cpp
index 7b93e223..68729907 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_568.cpp
@@ -1,4 +1,4 @@
-enum { // Keep this line as it is. It's a regression test for checking pc->prev->prev-> on CT_BRACE_OPEN.
+enum { // Keep this line as it is. It's a regression test for checking pc->GetPrev()->GetPrev()-> on CT_BRACE_OPEN.
   kEnumValue = 5,
 };
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_575.cpp
index 3ef21f1f..3ef21f1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_596.cpp
index 88f77e34..88f77e34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_682.h
index 8f1fc31f..8f1fc31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_687.cpp
index 0f9e8155..0f9e8155 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_752.cpp
index b0b77452..b0b77452 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_753.cpp
index 07cc31fe..07cc31fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_793.cpp
index 6777bfa5..6777bfa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_825.cpp
index d3f89db7..d3f89db7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_889.cpp
index 270f0695..270f0695 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_928.cpp
index d2878656..d2878656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-2.cpp
index 0ef61cde..0ef61cde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-3.cpp
index 28da2d74..28da2d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-4.cpp
index 0fe49c7b..0fe49c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref.cpp
index 85669bc6..85669bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/call_brace_init_lst.cpp
index 11f92ee3..11f92ee3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/case-brace-remove.cpp
index 421ff658..421ff658 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/case-brace-remove.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cast.cpp
index 7b29b06f..7b29b06f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/casts.cpp
index 0bcab0d9..0bcab0d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-addr.h
index ea539afa..ea539afa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-implementation.cpp
index 05eb69cf..05eb69cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-init.cpp
index af06e31a..af06e31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class.h
index 0048604d..0048604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-cpp-cont.cpp
index 8885e36b..8885e36b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-reflow.cpp
index adb5a6ab..adb5a6ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_backslash_eol.cpp
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent.cpp
index 542a0fd2..542a0fd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent_pp.h
index 25253f09..25253f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_insert.cpp
index a5ae87d5..a5ae87d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_right.cpp
index 121ea044..121ea044 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
index 1f3cff49..1f3cff49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comma.cpp
index e101145a..e101145a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align-multiline.cpp
index 73dab5ec..73dab5ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align.cpp
index 403bf773..403bf773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/const_throw.cpp
index f0d1773d..f0d1773d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constructor.cpp
index 46abf36a..46abf36a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cout.cpp
index c3c9366d..c3c9366d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp17.cpp
index ba463284..ba463284 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open-2.cpp
index 422cb1bf..422cb1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open.cpp
index 1544fd74..1544fd74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/define-indentation.cpp
index 69e924ee..69e924ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/delete.cpp
index fff916e3..fff916e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/deref.cpp
index abfb70c7..abfb70c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/digraph.cpp
index 57cfddf5..57cfddf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/disable_macro.cpp
index cb9fc307..cb9fc307 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-detab-strings.cpp
index fd622c3c..fd622c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-process-defines.cpp
index a0a58f85..a0a58f85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-process-defines.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
index 8753aee2..8753aee2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eigen.cpp
index 4e228311..4e228311 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum.cpp
index 524f1d4b..88b229a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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, /* set_chunk_parent() */
-   LSETTYP   = 92, /* set_chunk_type() */
+   LSETPAR   = 91, /* Chunk::SetParentTypeReal() */
+   LSETTYP   = 92, /* Chunk::SetTypeReal() */
    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.75.0/tests/input/cpp/enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_class.h
index 2ba9933f..2ba9933f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comma.h
index 42ce2c53..42ce2c53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_shr.cpp
index 8bde6273..8bde6273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/exception.cpp
index 7f29676e..7f29676e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_c.h
index e4943e50..e4943e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_func.cpp
index 24e90a37..24e90a37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/first_len_minimum.cpp
index 0a729f01..0a729f01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/fix_for_relational_operators.cpp
index 0014b110..0014b110 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_auto.cpp
index c62548f8..c62548f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_long.cpp
index 7685f614..7685f614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_loop_head.cpp
index cbfacf62..cbfacf62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/foreach.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/friends.cpp
index 1b073b45..1b073b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call.cpp
index 6467560f..6467560f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.cpp
index 64a11509..64a11509 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.h
index 168b0b3d..168b0b3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param.cpp
index 24b187c1..24b187c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param_indent_leading_comma.cpp
index 8c62d49b..8c62d49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/function-def.cpp
index 7f5e05c4..7f5e05c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/functype_param.cpp
index 5d2ff4fe..5d2ff4fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gcc_case_ellipsis.cpp
index 1b0b4088..1b0b4088 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gh555.cpp
index feb059d3..feb059d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/goto.cpp
index 0f50d182..0f50d182 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1165.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1207.cpp
index 0c8e1c92..0c8e1c92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1218.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1464.cpp
index 179ecd5e..179ecd5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1464.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1464.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1466.cpp
index fe704d2a..fe704d2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1466.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1466.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509.cpp
index d3e79ff6..d3e79ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509_bug_1112_correction.cpp
index 1470d613..1470d613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1516.cpp
index e1fe3f77..e1fe3f77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1536.cpp
index 2c33ec58..2c33ec58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1565.cpp
index 5cb66589..5cb66589 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1617.cpp
index 1901e3db..1901e3db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1768.cpp
index 7fa82285..7fa82285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2116.cpp
index 8011f572..8011f572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i683.cpp
index 4d95c7ce..4d95c7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if-constexpr.cpp
index 76f37f92..76f37f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_chain_braces.cpp
index 693efc63..693efc63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ifcomment.cpp
index 52f508f6..52f508f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-c.cpp
index e8f1ad51..5b4ace27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-c.cpp
@@ -120,9 +120,9 @@ static void indent_comment(Chunk *pc, int col);
 
 void indent_to_column(Chunk *pc, int column)
 {
-   if (column < pc->column)
+   if (column < pc->GetColumn())
    {
-      column = pc->column;
+      column = pc->GetColumn();
    }
    reindent_line(pc, column);
 }
@@ -139,16 +139,16 @@ void reindent_line(Chunk *pc, int column)
    int min_col;
 
    LOG_FMT(LINDLINE, "%s: %d] col %d on %.*s [%s] => %d\n",
-           __func__, pc->orig_line, pc->column, pc->len, pc->str,
-           get_token_name(pc->type), column);
+           __func__, pc->GetOrigLine(), pc->GetColumn(), pc->len, pc->GetStr(),
+           get_token_name(pc->GetType()), column);
 
-   if (column == pc->column)
+   if (column == pc->GetColumn())
    {
       return;
    }
-   col_delta  = column - pc->column;
-   pc->column = column;
-   min_col    = pc->column;
+   col_delta  = column - pc->GetColumn();
+   pc->SetColumn(column);
+   min_col    = pc->GetColumn();
 
    do
    {
@@ -156,26 +156,26 @@ void reindent_line(Chunk *pc, int column)
       pc       = pc->GetNext();
       if (pc != NULL)
       {
-         if (chunk_is_comment(pc))
+         if (pc->IsComment())
          {
-            pc->column = pc->orig_col;
-            if (pc->column < min_col)
+            pc->SetColumn(pc->GetOrigCol());
+            if (pc->GetColumn() < min_col)
             {
-               pc->column = min_col + 1;
+               pc->SetColumn(min_col + 1);
             }
             LOG_FMT(LINDLINE, "%s: set comment on line %d to col %d (orig %d)\n",
-                    __func__, pc->orig_line, pc->column, pc->orig_col);
+                    __func__, pc->GetOrigLine(), pc->GetColumn(), pc->GetOrigCol());
          }
          else
          {
-            pc->column += col_delta;
-            if (pc->column < min_col)
+            pc->SetColumn(pc->GetColumn() + col_delta);
+            if (pc->GetColumn() < min_col)
             {
-               pc->column = min_col;
+               pc->SetColumn(min_col);
             }
          }
       }
-   } while ((pc != NULL) && (pc->nl_count == 0));
+   } while ((pc != NULL) && (pc->GetNlCount() == 0));
 }
 
 
@@ -197,13 +197,13 @@ static void indent_pse_push(struct parse_frame& frm, Chunk *pc)
       memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos]));
 
       LOG_FMT(LINDPSE, "%4d] OPEN  [%d,%s] level=%d\n",
-              pc->orig_line, frm.pse_tos, get_token_name(pc->type), pc->level);
+              pc->GetOrigLine(), frm.pse_tos, get_token_name(pc->GetType()), pc->GetLevel());
 
-      frm.pse[frm.pse_tos].type       = pc->type;
-      frm.pse[frm.pse_tos].level      = pc->level;
-      frm.pse[frm.pse_tos].open_line  = pc->orig_line;
+      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->flags & PCF_IN_PREPROC) != 0;
+      frm.pse[frm.pse_tos].in_preproc = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
    }
 }
 
@@ -222,12 +222,12 @@ static void indent_pse_pop(struct parse_frame& frm, Chunk *pc)
       if (pc != NULL)
       {
          LOG_FMT(LINDPSE, "%4d] CLOSE [%d,%s] on %s, started on line %d, level=%d/%d\n",
-                 pc->orig_line, frm.pse_tos,
+                 pc->GetOrigLine(), frm.pse_tos,
                  get_token_name(frm.pse[frm.pse_tos].type),
-                 get_token_name(pc->type),
+                 get_token_name(pc->GetType()),
                  frm.pse[frm.pse_tos].open_line,
                  frm.pse[frm.pse_tos].level,
-                 pc->level);
+                 pc->GetLevel());
       }
       else
       {
@@ -301,11 +301,11 @@ void indent_text(void)
    {
       /* Handle proprocessor transitions */
       was_preproc = in_preproc;
-      in_preproc  = (pc->flags & PCF_IN_PREPROC) != 0;
+      in_preproc  = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
 
       if (cpd.settings[UO_indent_brace_parent].b)
       {
-         parent_token_indent = token_indent(pc->parent_type);
+         parent_token_indent = token_indent(pc->GetParentType());
       }
 
       /* Clean up after a #define */
@@ -332,8 +332,8 @@ void indent_text(void)
       }
 
       if ((cout_col > 0) &&
-          (chunk_is_semicolon(pc) ||
-           (pc->level < cout_level)))
+          (pc->IsSemicolon() ||
+           (pc->GetLevel() < cout_level)))
       {
          cout_col   = 0;
          cout_level = 0;
@@ -351,18 +351,18 @@ void indent_text(void)
          /* End anything that drops a level
           * REVISIT: not sure about the preproc check
           */
-         if (!chunk_is_newline(pc) &&
-             !chunk_is_comment(pc) &&
-             ((pc->flags & PCF_IN_PREPROC) == 0) &&
-             (frm.pse[frm.pse_tos].level > pc->level))
+         if (!pc->IsNewline() &&
+             !pc->IsComment() &&
+             ((pc->GetFlags() & PCF_IN_PREPROC) == 0) &&
+             (frm.pse[frm.pse_tos].level > pc->GetLevel()))
          {
             indent_pse_pop(frm, pc);
          }
 
-         if (frm.pse[frm.pse_tos].level == pc->level)
+         if (frm.pse[frm.pse_tos].level == pc->GetLevel())
          {
             /* process virtual braces closes (no text output) */
-            if ((pc->type == CT_VBRACE_CLOSE) &&
+            if ((pc->GetType() == CT_VBRACE_CLOSE) &&
                 (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN))
             {
                indent_pse_pop(frm, pc);
@@ -372,43 +372,43 @@ void indent_text(void)
 
             /* End any assign operations with a semicolon on the same level */
             if ((frm.pse[frm.pse_tos].type == CT_ASSIGN) &&
-                (chunk_is_semicolon(pc) ||
-                 (pc->type == CT_COMMA) ||
-                 (pc->type == CT_BRACE_OPEN)))
+                (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) &&
-                ((pc->type == CT_BRACE_OPEN) ||
-                 chunk_is_semicolon(pc)))
+                ((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) &&
-                ((pc->type == CT_BRACE_CLOSE) ||
-                 (pc->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) &&
-                chunk_is_semicolon(pc))
+                pc->IsSemicolon())
             {
                indent_pse_pop(frm, pc);
             }
 
             /* Close out parens and squares */
-            if ((frm.pse[frm.pse_tos].type == (pc->type - 1)) &&
-                ((pc->type == CT_PAREN_CLOSE) ||
-                 (pc->type == CT_SPAREN_CLOSE) ||
-                 (pc->type == CT_FPAREN_CLOSE) ||
-                 (pc->type == CT_SQUARE_CLOSE) ||
-                 (pc->type == CT_ANGLE_CLOSE)))
+            if ((frm.pse[frm.pse_tos].type == (pc->GetType() - 1)) &&
+                ((pc->GetType() == CT_PAREN_CLOSE) ||
+                 (pc->GetType() == CT_SPAREN_CLOSE) ||
+                 (pc->GetType() == CT_FPAREN_CLOSE) ||
+                 (pc->GetType() == CT_SQUARE_CLOSE) ||
+                 (pc->GetType() == CT_ANGLE_CLOSE)))
             {
                indent_pse_pop(frm, pc);
                frm.paren_count--;
@@ -419,10 +419,10 @@ void indent_text(void)
       /* Grab a copy of the current indent */
       indent_column = frm.pse[frm.pse_tos].indent_tmp;
 
-      if (!chunk_is_newline(pc) && !chunk_is_comment(pc))
+      if (!pc->IsNewline() && !pc->IsComment())
       {
          LOG_FMT(LINDPC, " -=[ %.*s ]=- top=%d %s %d/%d\n",
-                 pc->len, pc->str,
+                 pc->len, pc->GetStr(),
                  frm.pse_tos,
                  get_token_name(frm.pse[frm.pse_tos].type),
                  frm.pse[frm.pse_tos].indent_tmp,
@@ -445,7 +445,7 @@ void indent_text(void)
        *  - return
        */
 
-      if (pc->type == CT_BRACE_CLOSE)
+      if (pc->GetType() == CT_BRACE_CLOSE)
       {
          if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN)
          {
@@ -459,19 +459,19 @@ void indent_text(void)
                indent_column = frm.pse[frm.pse_tos].indent_tmp;
             }
 
-            if ((pc->parent_type == CT_IF) ||
-                (pc->parent_type == CT_ELSE) ||
-                (pc->parent_type == CT_ELSEIF) ||
-                (pc->parent_type == CT_DO) ||
-                (pc->parent_type == CT_WHILE) ||
-                (pc->parent_type == CT_SWITCH) ||
-                (pc->parent_type == CT_FOR))
+            if ((pc->GetParentType() == CT_IF) ||
+                (pc->GetParentType() == CT_ELSE) ||
+                (pc->GetParentType() == CT_ELSEIF) ||
+                (pc->GetParentType() == CT_DO) ||
+                (pc->GetParentType() == CT_WHILE) ||
+                (pc->GetParentType() == CT_SWITCH) ||
+                (pc->GetParentType() == CT_FOR))
             {
                indent_column += cpd.settings[UO_indent_brace].n;
             }
          }
       }
-      else if (pc->type == CT_VBRACE_OPEN)
+      else if (pc->GetType() == CT_VBRACE_OPEN)
       {
          frm.level++;
          indent_pse_push(frm, pc);
@@ -482,7 +482,7 @@ void indent_text(void)
          /* Always indent on virtual braces */
          indent_column = frm.pse[frm.pse_tos].indent_tmp;
       }
-      else if (pc->type == CT_BRACE_OPEN)
+      else if (pc->GetType() == CT_BRACE_OPEN)
       {
          frm.level++;
          indent_pse_push(frm, pc);
@@ -498,13 +498,13 @@ void indent_text(void)
             frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
 
             /* If this brace is part of a statement, bump it out by indent_brace */
-            if ((pc->parent_type == CT_IF) ||
-                (pc->parent_type == CT_ELSE) ||
-                (pc->parent_type == CT_ELSEIF) ||
-                (pc->parent_type == CT_DO) ||
-                (pc->parent_type == CT_WHILE) ||
-                (pc->parent_type == CT_SWITCH) ||
-                (pc->parent_type == CT_FOR))
+            if ((pc->GetParentType() == CT_IF) ||
+                (pc->GetParentType() == CT_ELSE) ||
+                (pc->GetParentType() == CT_ELSEIF) ||
+                (pc->GetParentType() == CT_DO) ||
+                (pc->GetParentType() == CT_WHILE) ||
+                (pc->GetParentType() == CT_SWITCH) ||
+                (pc->GetParentType() == CT_FOR))
             {
                if (parent_token_indent != 0)
                {
@@ -516,26 +516,26 @@ void indent_text(void)
                   indent_column += cpd.settings[UO_indent_brace].n;
                }
             }
-            else if (pc->parent_type == CT_CASE)
+            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;
             }
-            else if ((pc->parent_type == CT_CLASS) && !cpd.settings[UO_indent_class].b)
+            else if ((pc->GetParentType() == CT_CLASS) && !cpd.settings[UO_indent_class].b)
             {
                frm.pse[frm.pse_tos].indent -= indent_size;
             }
-            else if ((pc->parent_type == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
+            else if ((pc->GetParentType() == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
             {
                frm.pse[frm.pse_tos].indent -= indent_size;
             }
          }
 
-         if ((pc->flags & PCF_DONT_INDENT) != 0)
+         if ((pc->GetFlags() & PCF_DONT_INDENT) != 0)
          {
-            frm.pse[frm.pse_tos].indent = pc->column;
-            indent_column = pc->column;
+            frm.pse[frm.pse_tos].indent = pc->GetColumn();
+            indent_column = pc->GetColumn();
          }
          else
          {
@@ -547,12 +547,12 @@ void indent_text(void)
              *   b--; };
              */
             next = pc->GetNextNcNnl();
-            if (!chunk_is_newline_between(pc, next))
+            if (!pc->IsNewlineBetween(next))
             {
-               frm.pse[frm.pse_tos].indent = next->column;
+               frm.pse[frm.pse_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->orig_line;
+            frm.pse[frm.pse_tos].open_line  = pc->GetOrigLine();
 
             /* Update the indent_column if needed */
             if (cpd.settings[UO_indent_braces].n ||
@@ -562,7 +562,7 @@ void indent_text(void)
             }
          }
       }
-      else if (pc->type == CT_CASE)
+      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;
@@ -575,7 +575,7 @@ void indent_text(void)
          /* Always set on case statements */
          indent_column = frm.pse[frm.pse_tos].indent_tmp;
       }
-      else if (pc->type == CT_LABEL)
+      else if (pc->GetType() == CT_LABEL)
       {
          /* Labels get sent to the left or backed up */
          if (cpd.settings[UO_indent_label].n > 0)
@@ -588,7 +588,7 @@ void indent_text(void)
                             cpd.settings[UO_indent_label].n;
          }
       }
-      else if (pc->type == CT_CLASS_COLON)
+      else if (pc->GetType() == CT_CLASS_COLON)
       {
          /* just indent one level */
          indent_pse_push(frm, pc);
@@ -600,26 +600,26 @@ void indent_text(void)
          if (cpd.settings[UO_indent_class_colon].b)
          {
             prev = pc->GetPrev();
-            if (chunk_is_newline(prev))
+            if (prev->IsNewline())
             {
                frm.pse[frm.pse_tos].indent += 2;
                /* don't change indent of current line */
             }
          }
       }
-      else if ((pc->type == CT_PAREN_OPEN) ||
-               (pc->type == CT_SPAREN_OPEN) ||
-               (pc->type == CT_FPAREN_OPEN) ||
-               (pc->type == CT_SQUARE_OPEN) ||
-               (pc->type == CT_ANGLE_OPEN))
+      else if ((pc->GetType() == CT_PAREN_OPEN) ||
+               (pc->GetType() == CT_SPAREN_OPEN) ||
+               (pc->GetType() == CT_FPAREN_OPEN) ||
+               (pc->GetType() == CT_SQUARE_OPEN) ||
+               (pc->GetType() == CT_ANGLE_OPEN))
       {
          /* Open parens and squares - never update indent_column */
          indent_pse_push(frm, pc);
-         frm.pse[frm.pse_tos].indent = pc->column + pc->len;
+         frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len;
 
          if (cpd.settings[UO_indent_func_call_param].b &&
-             (pc->type == CT_FPAREN_OPEN) &&
-             (pc->parent_type == CT_FUNC_CALL))
+             (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;
          }
@@ -628,7 +628,7 @@ void indent_text(void)
              (chunk_is_str(pc, "[", 1) && !cpd.settings[UO_indent_square_nl].b))
          {
             next = pc->GetNextNc();
-            if (chunk_is_newline(next))
+            if (next->IsNewline())
             {
                int sub = 1;
                if (frm.pse[frm.pse_tos - 1].type == CT_ASSIGN)
@@ -641,7 +641,7 @@ void indent_text(void)
          frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
          frm.paren_count++;
       }
-      else if (pc->type == CT_ASSIGN)
+      else if (pc->GetType() == CT_ASSIGN)
       {
          /**
           * if there is a newline after the '=', just indent one level,
@@ -652,21 +652,21 @@ void indent_text(void)
          if (next != NULL)
          {
             indent_pse_push(frm, pc);
-            if (chunk_is_newline(next))
+            if (next->IsNewline())
             {
                frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
             }
             else
             {
-               frm.pse[frm.pse_tos].indent = pc->column + pc->len + 1;
+               frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len + 1;
             }
             frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
          }
       }
-      else if (pc->type == CT_RETURN)
+      else if (pc->GetType() == CT_RETURN)
       {
          /* don't count returns inside a () or [] */
-         if (pc->level == pc->brace_level)
+         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;
@@ -677,8 +677,8 @@ void indent_text(void)
       {
          if (cout_col == 0)
          {
-            cout_col   = pc->column;
-            cout_level = pc->level;
+            cout_col   = pc->GetColumn();
+            cout_level = pc->GetLevel();
          }
       }
       else
@@ -690,7 +690,7 @@ void indent_text(void)
       /**
        * Indent the line if needed
        */
-      if (did_newline && !chunk_is_newline(pc) && (pc->len != 0))
+      if (did_newline && !pc->IsNewline() && (pc->len != 0))
       {
          /**
           * Check for special continuations.
@@ -699,59 +699,59 @@ void indent_text(void)
           */
 
          prev = pc->GetPrevNcNnl();
-         if ((pc->type == CT_MEMBER) ||
-             (pc->type == CT_DC_MEMBER) ||
+         if ((pc->GetType() == CT_MEMBER) ||
+             (pc->GetType() == CT_DC_MEMBER) ||
              ((prev != NULL) &&
-              ((prev->type == CT_MEMBER) ||
-               (prev->type == CT_DC_MEMBER))))
+              ((prev->GetType() == CT_MEMBER) ||
+               (prev->GetType() == CT_DC_MEMBER))))
          {
             tmp = cpd.settings[UO_indent_member].n + indent_column;
             LOG_FMT(LINDENT, "%s: %d] member => %d\n",
-                    __func__, pc->orig_line, tmp);
+                    __func__, pc->GetOrigLine(), tmp);
             reindent_line(pc, tmp);
          }
          else if (chunk_is_str(pc, "<<", 2) && (cout_col > 0))
          {
             LOG_FMT(LINDENT, "%s: %d] cout_col => %d\n",
-                    __func__, pc->orig_line, cout_col);
+                    __func__, pc->GetOrigLine(), cout_col);
             reindent_line(pc, cout_col);
          }
          else if ((vardefcol > 0) &&
-                  (pc->type == CT_WORD) &&
-                  ((pc->flags & PCF_VAR_DEF) != 0) &&
-                  (prev != NULL) && (prev->type == CT_COMMA))
+                  (pc->GetType() == CT_WORD) &&
+                  ((pc->GetFlags() & PCF_VAR_DEF) != 0) &&
+                  (prev != NULL) && (prev->GetType() == CT_COMMA))
          {
             LOG_FMT(LINDENT, "%s: %d] Vardefcol => %d\n",
-                    __func__, pc->orig_line, vardefcol);
+                    __func__, pc->GetOrigLine(), vardefcol);
             reindent_line(pc, vardefcol);
          }
-         else if ((pc->type == CT_STRING) && (prev->type == CT_STRING) &&
+         else if ((pc->GetType() == CT_STRING) && (prev->GetType() == CT_STRING) &&
                   cpd.settings[UO_indent_align_string].b)
          {
             LOG_FMT(LINDENT, "%s: %d] String => %d\n",
-                    __func__, pc->orig_line, prev->column);
-            reindent_line(pc, prev->column);
+                    __func__, pc->GetOrigLine(), prev->GetColumn());
+            reindent_line(pc, prev->GetColumn());
          }
-         else if (chunk_is_comment(pc))
+         else if (pc->IsComment())
          {
             LOG_FMT(LINDENT, "%s: %d] comment => %d\n",
-                    __func__, pc->orig_line, frm.pse[frm.pse_tos].indent_tmp);
+                    __func__, pc->GetOrigLine(), frm.pse[frm.pse_tos].indent_tmp);
             indent_comment(pc, frm.pse[frm.pse_tos].indent_tmp);
          }
-         else if (pc->type == CT_PREPROC)
+         else if (pc->GetType() == CT_PREPROC)
          {
             /* Preprocs are always in column 1. See indent_preproc() */
-            if (pc->column != 1)
+            if (pc->GetColumn() != 1)
             {
                reindent_line(pc, 1);
             }
          }
          else
          {
-            if (pc->column != indent_column)
+            if (pc->GetColumn() != indent_column)
             {
                LOG_FMT(LINDENT, "%s: %d] indent => %d [%.*s]\n",
-                       __func__, pc->orig_line, indent_column, pc->len, pc->str);
+                       __func__, pc->GetOrigLine(), indent_column, pc->len, pc->GetStr());
                reindent_line(pc, indent_column);
             }
          }
@@ -761,22 +761,22 @@ void indent_text(void)
       /**
        * Handle variable definition continuation indenting
        */
-      if ((pc->type == CT_WORD) &&
-          ((pc->flags & PCF_IN_FCN_DEF) == 0) &&
-          ((pc->flags & PCF_VAR_1ST_DEF) == PCF_VAR_1ST_DEF))
+      if ((pc->GetType() == CT_WORD) &&
+          ((pc->GetFlags() & PCF_IN_FCN_DEF) == 0) &&
+          ((pc->GetFlags() & PCF_VAR_1ST_DEF) == PCF_VAR_1ST_DEF))
       {
-         vardefcol = pc->column;
+         vardefcol = pc->GetColumn();
       }
-      if (chunk_is_semicolon(pc) ||
-          ((pc->type == CT_BRACE_OPEN) && (pc->parent_type == CT_FUNCTION)))
+      if (pc->IsSemicolon() ||
+          ((pc->GetType() == CT_BRACE_OPEN) && (pc->GetParentType() == CT_FUNCTION)))
       {
          vardefcol = 0;
       }
 
       /* if we hit a newline, reset indent_tmp */
-      if (chunk_is_newline(pc) ||
-          (pc->type == CT_COMMENT_MULTI) ||
-          (pc->type == CT_COMMENT_CPP))
+      if (pc->IsNewline() ||
+          (pc->GetType() == CT_COMMENT_MULTI) ||
+          (pc->GetType() == CT_COMMENT_CPP))
       {
          frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
 
@@ -784,7 +784,7 @@ void indent_text(void)
           * Handle the case of a multi-line #define w/o anything on the
           * first line (indent_tmp will be 1 or 0)
           */
-         if ((pc->type == CT_NL_CONT) &&
+         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;
@@ -794,7 +794,7 @@ void indent_text(void)
          did_newline = true;
       }
 
-      if (!chunk_is_comment(pc) && !chunk_is_newline(pc))
+      if (!pc->IsComment() && !pc->IsNewline())
       {
          prev = pc;
       }
@@ -827,16 +827,16 @@ static bool single_line_comment_indent_rule_applies(Chunk *start)
 {
    Chunk *pc      = start;
    int     nl_count = 0;
-   if (!chunk_is_single_line_comment(pc))
+   if (!pc->IsSingleLineComment())
    {
       return(false);
    }
    /* scan forward, if only single newlines and comments before next line of code, we want to apply */
    while ((pc = pc->GetNext()) != NULL)
    {
-      if (chunk_is_newline(pc))
+      if (pc->IsNewline())
       {
-         if (nl_count > 0 || pc->nl_count > 1)
+         if (nl_count > 0 || pc->GetNlCount() > 1)
          {
             return(false);
          }
@@ -846,11 +846,11 @@ static bool single_line_comment_indent_rule_applies(Chunk *start)
       else
       {
          nl_count = 0;
-         if (!chunk_is_single_line_comment(pc))
+         if (!pc->IsSingleLineComment())
          {
             /* here we check for things to run into that we wouldn't want to indent the comment for */
             /* for example, non-single line comment, closing brace */
-            if (chunk_is_comment(pc) || chunk_is_closing_brace(pc))
+            if (pc->IsComment() || pc->IsBraceClose())
             {
                return(false);
             }
@@ -898,58 +898,58 @@ static void indent_comment(Chunk *pc, int col)
    Chunk *prev;
 
    LOG_FMT(LCMTIND, "%s: line %d, col %d, level %d: ", __func__,
-           pc->orig_line, pc->orig_col, pc->level);
+           pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
 
    /* force column 1 comment to column 1 if not changing them */
-   if ((pc->orig_col == 1) && !cpd.settings[UO_indent_col1_comment].b)
+   if ((pc->GetOrigCol() == 1) && !cpd.settings[UO_indent_col1_comment].b)
    {
       LOG_FMT(LCMTIND, "rule 1 - keep in col 1\n");
-      pc->column = 1;
+      pc->SetColumn(1);
       return;
    }
 
    nl = pc->GetPrev();
 
    /* outside of any expression or statement? */
-   if (pc->level == 0)
+   if (pc->GetLevel() == 0)
    {
-      if ((nl != NULL) && (nl->nl_count > 1))
+      if ((nl != NULL) && (nl->GetNlCount() > 1))
       {
          LOG_FMT(LCMTIND, "rule 2 - level 0, nl before\n");
-         pc->column = 1;
+         pc->SetColumn(1);
          return;
       }
    }
 
    prev = nl->GetPrev();
-   if (chunk_is_comment(prev) && (nl->nl_count == 1))
+   if (prev->IsComment() && (nl->GetNlCount() == 1))
    {
-      int coldiff = prev->orig_col - pc->orig_col;
+      int coldiff = prev->GetOrigCol() - pc->GetOrigCol();
 
       if ((coldiff <= 3) && (coldiff >= -3))
       {
-         pc->column = prev->column;
+         pc->SetColumn(prev->GetColumn());
          LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %d\n",
-                 coldiff, pc->column);
+                 coldiff, pc->GetColumn());
          return;
       }
    }
    /* check if special single line comment rule applies */
    if (cpd.settings[UO_indent_sing_line_comments].n > 0 && single_line_comment_indent_rule_applies(pc))
    {
-      pc->column = col + cpd.settings[UO_indent_sing_line_comments].n;
-      LOG_FMT(LCMTIND, "rule 4 - single line comment indent, now in %d\n", pc->column);
+      pc->SetColumn(col + cpd.settings[UO_indent_sing_line_comments].n);
+      LOG_FMT(LCMTIND, "rule 4 - single line comment indent, now in %d\n", pc->GetColumn());
       return;
    }
    LOG_FMT(LCMTIND, "rule 5 - fall-through, stay in %d\n", col);
 
-   pc->column = col;
+   pc->SetColumn(col);
 }
 
 
 /**
  * Put spaces on either side of the preproc (#) symbol.
- * This is done by pointing pc->str into pp_str and adjusting the
+ * This is done by pointing pc->GetStr() into pp_str and adjusting the
  * length.
  */
 void indent_preproc(void)
@@ -969,7 +969,7 @@ void indent_preproc(void)
 
    for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
    {
-      if (chunk_is_comment(pc) || chunk_is_newline(pc))
+      if (pc->IsComment() || pc->IsNewline())
       {
          continue;
       }
@@ -977,12 +977,12 @@ void indent_preproc(void)
       if (stage == 0)
       {
          /* Check the first PP, make sure it is an #if type */
-         if (pc->type != CT_PREPROC)
+         if (pc->GetType() != CT_PREPROC)
          {
             break;
          }
          next = pc->GetNext();
-         if ((next == NULL) || (next->type != CT_PP_IF))
+         if ((next == NULL) || (next->GetType() != CT_PP_IF))
          {
             break;
          }
@@ -991,8 +991,8 @@ void indent_preproc(void)
       else if (stage == 1)
       {
          /* Scan until a PP at level 0 is found - the close to the #if */
-         if ((pc->type == CT_PREPROC) &&
-             (pc->pp_level == 0))
+         if ((pc->GetType() == CT_PREPROC) &&
+             (pc->GetPpLevel() == 0))
          {
             stage = 2;
          }
@@ -1001,8 +1001,8 @@ void indent_preproc(void)
       else if (stage == 2)
       {
          /* We should only see the rest of the preprocessor */
-         if ((pc->type == CT_PREPROC) ||
-             ((pc->flags & PCF_IN_PREPROC) == 0))
+         if ((pc->GetType() == CT_PREPROC) ||
+             ((pc->GetFlags() & PCF_IN_PREPROC) == 0))
          {
             stage = 0;
             break;
@@ -1018,16 +1018,16 @@ void indent_preproc(void)
 
    for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
    {
-      if (pc->type != CT_PREPROC)
+      if (pc->GetType() != CT_PREPROC)
       {
          continue;
       }
 
-      if (pc->column != 1)
+      if (pc->GetColumn() != 1)
       {
          /* Don't handle preprocessors that aren't in column 1 */
          LOG_FMT(LINFO, "%s: Line %d doesn't start in column 1 (%d)\n",
-                 __func__, pc->orig_line, pc->column);
+                 __func__, pc->GetOrigLine(), pc->GetColumn());
          continue;
       }
 
@@ -1035,14 +1035,14 @@ void indent_preproc(void)
       if (pc->len == 2)
       {
          /* alternate token crap */
-         pc->str = &alt_str[16];
+         pc->Str() = &alt_str[16];
       }
       else
       {
-         pc->str = &pp_str[16];
+         pc->Str() = &pp_str[16];
       }
 
-      pp_level = pc->pp_level - pp_level_sub;
+      pp_level = pc->GetPpLevel() - pp_level_sub;
       if (pp_level < 0)
       {
          pp_level = 0;
@@ -1056,13 +1056,13 @@ void indent_preproc(void)
       if ((cpd.settings[UO_pp_indent].a & AV_ADD) != 0)
       {
          /* Need to add some spaces */
-         pc->str -= pp_level;
+         pc->Str() -= pp_level;
          pc->len += pp_level;
       }
       else if (cpd.settings[UO_pp_indent].a == AV_IGNORE)
       {
-         tmp      = (pc->orig_col <= 16) ? pc->orig_col - 1 : 16;
-         pc->str -= tmp;
+         tmp      = (pc->GetOrigCol() <= 16) ? pc->GetOrigCol() - 1 : 16;
+         pc->Str() -= tmp;
          pc->len += tmp;
       }
 
@@ -1079,6 +1079,6 @@ void indent_preproc(void)
       }
 
       LOG_FMT(LPPIS, "%s: Indent line %d to %d (len %d, next->col %d)\n",
-              __func__, pc->orig_line, pp_level, pc->len, next->column);
+              __func__, pc->GetOrigLine(), GetPpLevel(), pc->len, next->GetColumn());
    }
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-inside-ternary-operator.cpp
index 6cd779a3..40cdad92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-inside-ternary-operator.cpp
@@ -1,12 +1,12 @@
 (tmp
-            ? chunk_is_newline(tmp)
+            ? tmp->IsNewline()
 ? "newline"
-		: chunk_is_comment(tmp)
+		: tmp->IsComment()
                           ? "comment"
 						     : "other"
-						                    : chunk_is_newline(tmp)
+						                    : tmp->IsNewline()
           ? "newline"
-                                                      : chunk_is_comment(tmp)
+                                                      : tmp->IsComment()
                 ? "comment"
                                 : "other");
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-misc.cpp
index 78a924f4..78a924f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-off.cpp
index 79a7ad65..79a7ad65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent.cpp
index a8c4a514..a8c4a514 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_braces_no.h
index c5b39b37..c5b39b37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_func.cpp
index d417b5be..d417b5be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_glob.cpp
index 8e01afc6..8e01afc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_glob.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_glob.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comment_align_thresh.cpp
index 7ddfacbf..7ddfacbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_init.cpp
index d9fefe24..d9fefe24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_members_twice.cpp
index 4fbd1b4c..4fbd1b4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_members_twice.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_func_alias_prototype.cpp
index 7bd2afdc..7bd2afdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace.h
index f97bd324..f97bd324 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace2.h
index db2ce47d..db2ce47d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace_inner_only.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_inner_only.h
index a73879a7..a73879a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace_inner_only.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_inner_only.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_single_indent.h
index 97d57444..97d57444 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_off_after_return.cpp
index 58e24797..58e24797 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_param.cpp
index c194141b..c194141b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_call.cpp
index 96b38fba..96b38fba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_decl.cpp
index ff8c3e44..ff8c3e44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_def.cpp
index 703e0422..703e0422 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_shift.cpp
index 54684fa7..54684fa7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_switch_pp.cpp
index 1b76e218..1b76e218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/indent_ternary-1.cpp
new file mode 100644
index 00000000..7281a2e6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ternary-1.cpp
@@ -0,0 +1,76 @@
+namespace ns1 {
+    int getval(void);
+    void baz(void);
+}
+
+
+int foo(int in1, int in2, float in3, double in4) {
+    int a; int b; int c; int d;
+    int e; int f; int g; int h;
+
+    a = (in1 < 10) ? in2 :
+        ns1::getval();
+
+    b = (in1 < 20) ? in2 :
+        int(in3 * 0.4);
+
+    c = (in1 < 30) ? in2 :
+        1.25 * in4;
+
+    d = (in1 < 40) ? in2 :
+        -3;
+
+    e = (in1 < 50) ? in2 :
+        ~3 ^ in1;
+
+    f = (in1 < 60) ? in2 :
+        !(in1 == in2);
+
+    g = (in1 < 70) ? in2 :
+        ++in1;
+
+    h = (in1 < 80) ? in2 :
+        in1 * 2;
+
+    if ((in1 < 10) ? in2 :
+            ns1::getval()) {
+        ns1::baz();
+    }
+
+    if ((in1 < 20) ? in2 :
+        int(in3 * 0.4)) {
+        ns1::baz();
+    }
+
+    if ((in1 < 30) ? in2 :
+        1.25 * in4) {
+        ns1::baz();
+    }
+
+    if ((in1 < 40) ? in2 :
+        -3) {
+        ns1::baz();
+    }
+
+    if ((in1 < 50) ? in2 :
+        ~3 ^ in1) {
+        ns1::baz();
+    }
+
+    if ((in1 < 60) ? in2 :
+        !(in1 == in2)) {
+        ns1::baz();
+    }
+
+    if ((in1 < 70) ? in2 :
+        ++in1) {
+        ns1::baz();
+    }
+
+    if ((in1 < 80) ? in2 :
+        in1 * 2) {
+        ns1::baz();
+    }
+
+    return a+b+c+d+e+f+g+h;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def.cpp
index 394cfb63..394cfb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def_cont.cpp
index d273ae52..d273ae52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init-list-call.cpp
index 70451ac4..70451ac4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init_align.h
index ff1dcc9b..ff1dcc9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/initlist_leading_commas.cpp
index 83188d77..83188d77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/interface-keyword-in-cpp.cpp
index bc039e18..bc039e18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1752.cpp
index e3be4d50..e3be4d50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1782.cpp
index c12b83d0..c12b83d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1804.cpp
index 2923a4a2..2923a4a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1916.cpp
index 4c819605..4c819605 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1985.cpp
index 4e5685a1..4e5685a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2000.cpp
index aa324f2e..aa324f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-1.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-2.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-1.cpp
index a1ebb1a7..a1ebb1a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-2.cpp
index 5725d3d7..5725d3d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2623.cpp
index 5834e4b3..5834e4b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116-2.cpp
index 6e007772..6e007772 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116.cpp
index 96167df1..96167df1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3330.cpp
index 37062480..37062480 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3368.cpp
index 2158086c..2158086c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3378.cpp
index 319c3151..319c3151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3378.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3378.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_564.cpp
index 0c289a8a..0c289a8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574-i.cpp
index c7730a54..c7730a54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574-i.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574-i.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574.cpp
index 96e910ca..96e910ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_633_typename.cpp
index e99742ef..e99742ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_672.cpp
index 6d8dde90..6d8dde90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst.cpp
index e57868e2..e57868e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst2.cpp
index d167cc1c..d167cc1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda.cpp
index 7bc50606..7bc50606 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda2.cpp
index a4b8a8c6..a4b8a8c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_brace_list.cpp
index da3db41f..da3db41f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_brace_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_brace_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_selfcalling.cpp
index 543290fa..543290fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Mac.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Unix.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Win.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_br_cmt.cpp
index a7638876..a7638876 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_namespace.cpp
index 89fe4435..89fe4435 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/macro_spaces.cpp
index c27c6b5d..c27c6b5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc.cpp
index 8a73b431..8a73b431 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc2.cpp
index b6ce3078..b6ce3078 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc3.cpp
index c7c10d6c..c7c10d6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc4.cpp
index 725fa160..725fa160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc5.cpp
index 570a4a76..570a4a76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return.cpp
index ca3105da..ca3105da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ms-style-ref.cpp
index 213393b9..213393b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/multi_line.cpp
index df5f3a84..df5f3a84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/new_op.cpp
index 828215e8..828215e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-class.h
index 128974b7..128974b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-namespace.h
index a436fcb7..a436fcb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_after.h
index fb77edf1..fb77edf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_after.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_brace_open_test.cpp
index 6e3daf66..6e3daf66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_func_body_def.cpp
index c7cab4c7..c7cab4c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
index f4065b20..f4065b20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_struct.cpp
index edac027c..edac027c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_struct.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_struct.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_brace_brace.cpp
index b698546a..b698546a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func.cpp
index e27d7e55..e27d7e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren.cpp
index 309a65a9..309a65a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_decl.cpp
index 91a7184f..91a7184f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_def_paren_empty.cpp
index f1ba8607..f1ba8607 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_paren_empty.cpp
index 19965aac..19965aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_scope_name.cpp
index d221e974..d221e974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_type_name.cpp
index 26e49663..26e49663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_inside_namespace.cpp
index 4bdcb394..4bdcb394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_max_blank_in_func.cpp
index c87e6e68..c87e6e68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/noexcept.cpp
index e6ea9116..e6ea9116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/op_sym_empty.cpp
index 4b79ca9e..4b79ca9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator.cpp
index 6f2a7f03..6f2a7f03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator_proto.cpp
index b14935ee..b14935ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/output.cpp
index 42c2582c..a770b7ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/output.cpp
@@ -123,19 +123,19 @@ void output_parsed(FILE *pfile)
    for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
    {
       fprintf(pfile, "\n%3d> %13.13s[%13.13s][%2d/%2d/%2d][%d/%d/%d][%6x][%d-%d]",
-              pc->orig_line, get_token_name(pc->type),
-              get_token_name(pc->parent_type),
-              pc->column, pc->orig_col, pc->orig_col_end,
-              pc->brace_level, pc->level, pc->pp_level,
-              pc->flags, pc->nl_count, pc->after_tab);
+              pc->GetOrigLine(), get_token_name(pc->GetType()),
+              get_token_name(pc->GetParentType()),
+              pc->GetColumn(), pc->GetOrigCol(), pc->GetOrigColEnd(),
+              pc->GetBraceLevel(), pc->GetLevel(), pc->GetPpLevel(),
+              pc->GetFlags(), pc->GetNlCount(), pc->GetAfterTab());
 
-      if ((pc->type != CT_NEWLINE) && (pc->len != 0))
+      if ((pc->GetType() != CT_NEWLINE) && (pc->len != 0))
       {
-         for (cnt = 0; cnt < pc->column; cnt++)
+         for (cnt = 0; cnt < pc->GetColumn(); cnt++)
          {
             fprintf(pfile, " ");
          }
-         fprintf(pfile, "%.*s", pc->len, pc->str);
+         fprintf(pfile, "%.*s", pc->len, pc->GetStr());
       }
    }
    fprintf(pfile, "\n-=====-\n");
@@ -153,13 +153,13 @@ void output_options(FILE *pfile)
       ptr = get_option_name(idx);
       if (ptr != NULL)
       {
-         if (ptr->type == AT_BOOL)
+         if (ptr->GetType() == AT_BOOL)
          {
             fprintf(pfile, "%3d) %32s = %s\n",
                     ptr->id, ptr->name,
                     cpd.settings[ptr->id].b ? "True" : "False");
          }
-         else if (ptr->type == AT_IARF)
+         else if (ptr->GetType() == AT_IARF)
          {
             fprintf(pfile, "%3d) %32s = %s\n",
                     ptr->id, ptr->name,
@@ -167,7 +167,7 @@ void output_options(FILE *pfile)
                     (cpd.settings[ptr->id].a == AV_REMOVE) ? "Remove" :
                     (cpd.settings[ptr->id].a == AV_FORCE) ? "Force" : "Ignore");
          }
-         else if (ptr->type == AT_LINE)
+         else if (ptr->GetType() == AT_LINE)
          {
             fprintf(pfile, "%3d) %32s = %s\n",
                     ptr->id, ptr->name,
@@ -200,9 +200,9 @@ void output_text(FILE *pfile)
 
    for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
    {
-      if (pc->type == CT_NEWLINE)
+      if (pc->GetType() == CT_NEWLINE)
       {
-         for (cnt = 0; cnt < pc->nl_count; cnt++)
+         for (cnt = 0; cnt < pc->GetNlCount(); cnt++)
          {
             add_char('\n');
          }
@@ -210,18 +210,18 @@ void output_text(FILE *pfile)
          cpd.column      = 1;
          LOG_FMT(LOUTIND, " xx\n");
       }
-      else if (pc->type == CT_COMMENT_MULTI)
+      else if (pc->GetType() == CT_COMMENT_MULTI)
       {
          output_comment_multi(pc);
       }
-      else if (pc->type == CT_COMMENT_CPP)
+      else if (pc->GetType() == CT_COMMENT_CPP)
       {
          pc = output_comment_cpp(pc);
       }
       else if (pc->len == 0)
       {
          /* don't do anything for non-visible stuff */
-         LOG_FMT(LOUTIND, " <%d> -", pc->column);
+         LOG_FMT(LOUTIND, " <%d> -", pc->GetColumn());
       }
       else
       {
@@ -230,39 +230,39 @@ void output_text(FILE *pfile)
          {
             if (cpd.settings[UO_indent_with_tabs].n == 1)
             {
-               lvlcol = 1 + (pc->brace_level * cpd.settings[UO_indent_columns].n);
-               if ((pc->column >= lvlcol) && (lvlcol > 1))
+               lvlcol = 1 + (pc->GetBraceLevel() * cpd.settings[UO_indent_columns].n);
+               if ((pc->GetColumn() >= lvlcol) && (lvlcol > 1))
                {
                   output_to_column(lvlcol, true);
                }
             }
             allow_tabs = (cpd.settings[UO_indent_with_tabs].n == 2) ||
-                         (chunk_is_comment(pc) &&
+                         (pc->IsComment() &&
                           (cpd.settings[UO_indent_with_tabs].n != 0));
 
-            LOG_FMT(LOUTIND, "  %d> col %d/%d - ", pc->orig_line, pc->column, cpd.column);
+            LOG_FMT(LOUTIND, "  %d> col %d/%d - ", pc->GetOrigLine(), pc->GetColumn(), cpd.column);
          }
          else
          {
             /* not the first item on a line */
             if (cpd.settings[UO_align_keep_tabs].b)
             {
-               allow_tabs = pc->after_tab;
+               allow_tabs = pc->GetAfterTab();
             }
             else
             {
                prev       = pc->GetPrev();
                allow_tabs = (cpd.settings[UO_align_with_tabs].b &&
-                             ((pc->flags & PCF_WAS_ALIGNED) != 0) &&
-                             (((pc->column - 1) % cpd.settings[UO_output_tab_size].n) == 0) &&
-                             ((prev->column + prev->len + 1) != pc->column));
+                             ((pc->GetFlags() & PCF_WAS_ALIGNED) != 0) &&
+                             (((pc->GetColumn() - 1) % cpd.settings[UO_output_tab_size].n) == 0) &&
+                             ((prev->GetColumn() + prev->len + 1) != pc->GetColumn()));
             }
-            LOG_FMT(LOUTIND, " %d -", pc->column);
+            LOG_FMT(LOUTIND, " %d -", pc->GetColumn());
          }
 
-         output_to_column(pc->column, allow_tabs);
-         add_text_len(pc->str, pc->len);
-         cpd.did_newline = chunk_is_newline(pc);
+         output_to_column(pc->GetColumn(), allow_tabs);
+         add_text_len(pc->GetStr(), pc->len);
+         cpd.did_newline = pc->IsNewline();
       }
    }
 }
@@ -387,16 +387,16 @@ static int calculate_comment_body_indent(const char *str, int len, int start_col
  */
 Chunk *output_comment_cpp(Chunk *first)
 {
-   int col    = first->column;
-   int col_br = 1 + (first->brace_level * cpd.settings[UO_indent_columns].n);
+   int col    = first->GetColumn();
+   int col_br = 1 + (first->GetBraceLevel() * cpd.settings[UO_indent_columns].n);
 
    /* Make sure we have at least one space past the last token */
-   if (first->parent_type == CT_COMMENT_END)
+   if (first->GetParentType() == CT_COMMENT_END)
    {
       Chunk *prev = first->GetPrev();
       if (prev != NULL)
       {
-         int col_min = prev->column + prev->len + 1;
+         int col_min = prev->GetColumn() + prev->len + 1;
          if (col < col_min)
          {
             col = col_min;
@@ -409,7 +409,7 @@ Chunk *output_comment_cpp(Chunk *first)
 
    if (!cpd.settings[UO_cmt_cpp_to_c].b)
    {
-      add_text_len(first->str, first->len);
+      add_text_len(first->GetStr(), first->len);
       return(first);
    }
 
@@ -419,7 +419,7 @@ Chunk *output_comment_cpp(Chunk *first)
    {
       /* next is a newline by definition */
       Chunk *next = first->GetNext();
-      if ((next != NULL) && (next->nl_count == 1))
+      if ((next != NULL) && (next->GetNlCount() == 1))
       {
          next = next->GetNext();
 
@@ -431,10 +431,10 @@ Chunk *output_comment_cpp(Chunk *first)
           * level or less
           */
          if ((next != NULL) &&
-             (next->type == CT_COMMENT_CPP) &&
-             (((next->column == 1) && (first->column == 1)) ||
-              ((next->column == col_br) && (first->column == col_br)) ||
-              ((next->column > col_br) && (first->parent_type == CT_COMMENT_END))))
+             (next->GetType() == CT_COMMENT_CPP) &&
+             (((next->GetColumn() == 1) && (first->GetColumn() == 1)) ||
+              ((next->GetColumn() == col_br) && (first->GetColumn() == col_br)) ||
+              ((next->GetColumn() > col_br) && (first->GetParentType() == CT_COMMENT_END))))
          {
             combined = true;
          }
@@ -445,11 +445,11 @@ Chunk *output_comment_cpp(Chunk *first)
    {
       /* nothing to group: just output a single line */
       add_text_len("/*", 2);
-      if ((first->str[2] != ' ') && (first->str[2] != '\t'))
+      if ((first->GetStr()[2] != ' ') && (first->GetStr()[2] != '\t'))
       {
          add_char(' ');
       }
-      add_text_len(&first->str[2], first->len - 2);
+      add_text_len(&first->GetStr()[2], first->len - 2);
       add_text_len(" */", 3);
       return(first);
    }
@@ -471,17 +471,17 @@ Chunk *output_comment_cpp(Chunk *first)
    /* Output combined lines */
    while ((pc = pc->GetNext()) != NULL)
    {
-      if ((pc->type == CT_NEWLINE) && (pc->nl_count == 1))
+      if ((pc->GetType() == CT_NEWLINE) && (pc->GetNlCount() == 1))
       {
          continue;
       }
-      if (pc->type != CT_COMMENT_CPP)
+      if (pc->GetType() != CT_COMMENT_CPP)
       {
          break;
       }
-      if (((pc->column == 1) && (first->column == 1)) ||
-          ((pc->column == col_br) && (first->column == col_br)) ||
-          ((pc->column > col_br) && (first->parent_type == CT_COMMENT_END)))
+      if (((pc->GetColumn() == 1) && (first->GetColumn() == 1)) ||
+          ((pc->GetColumn() == col_br) && (first->GetColumn() == col_br)) ||
+          ((pc->GetColumn() > col_br) && (first->GetParentType() == CT_COMMENT_END)))
       {
          last = pc;
 cpp_newline:
@@ -490,11 +490,11 @@ cpp_newline:
          add_char(' ');
          add_char(cpd.settings[UO_cmt_star_cont].b ? '*' : ' ');
 cpp_addline:
-         if ((pc->str[2] != ' ') && (pc->str[2] != '\t'))
+         if ((pc->GetStr()[2] != ' ') && (pc->GetStr()[2] != '\t'))
          {
             add_char(' ');
          }
-         add_text_len(&pc->str[2], pc->len - 2);
+         add_text_len(&pc->GetStr()[2], pc->len - 2);
       }
    }
 
@@ -509,7 +509,7 @@ cpp_addline:
 
 void output_comment_multi(Chunk *pc)
 {
-   int        cmt_col = pc->column;
+   int        cmt_col = pc->GetColumn();
    const char *cmt_str;
    int        remaining;
    char       ch;
@@ -522,23 +522,23 @@ void output_comment_multi(Chunk *pc)
    int        xtra     = 1;
 
    prev = pc->GetPrev();
-   if ((prev != NULL) && (prev->type != CT_NEWLINE))
+   if ((prev != NULL) && (prev->GetType() != CT_NEWLINE))
    {
-      cmt_col = pc->orig_col;
+      cmt_col = pc->GetOrigCol();
    }
    else
    {
-      col_diff = pc->orig_col - pc->column;
+      col_diff = pc->GetOrigCol() - pc->GetColumn();
    }
 
    //   fprintf(stderr, "Indenting1 line %d to col %d (orig=%d) col_diff=%d\n",
-   //           pc->orig_line, cmt_col, pc->orig_col, col_diff);
+   //           pc->GetOrigLine(), cmt_col, pc->GetOrigCol(), col_diff);
 
-   xtra = calculate_comment_body_indent(pc->str, pc->len, pc->column);
+   xtra = calculate_comment_body_indent(pc->GetStr(), pc->len, pc->GetColumn());
 
    ccol      = 1;
    remaining = pc->len;
-   cmt_str   = pc->str;
+   cmt_str   = pc->GetStr();
    line_len  = 0;
    while (remaining > 0)
    {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/parameter-packs.cpp
index 6d734b1f..6d734b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/patch_32.cpp
index 8d9e222e..8d9e222e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_bool_in_template.h
index ef01470e..ef01470e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_shift.cpp
index 4d55a541..4d55a541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-define-indent.cpp
index 8ec5657f..8ec5657f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-pragma.cpp
index 75b3c46d..75b3c46d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_brace.cpp
index 1e02efcb..1e02efcb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_case.cpp
index da61641a..da61641a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_extern.cpp
index 76cfc4bf..76cfc4bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_func_def.cpp
index 7a0bcecf..7a0bcecf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_multi_comment.cpp
index 98418c46..98418c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ptr-star.cpp
index ff0ab369..ff0ab369 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qt-1.cpp
index e318c1aa..e318c1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qtargs.cpp
index 5037d792..5037d792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/region.cpp
index 28447084..28447084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_init_list.cpp
index f58dfee5..f58dfee5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/returns.cpp
index 1085bd72..1085bd72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sef.cpp
index add2fc4a..add2fc4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semi.cpp
index 9f7832cd..9f7832cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semicolons.cpp
index 52796f75..52796f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.2886991.cpp
index 97dfe0cf..97dfe0cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3266678.cpp
index 69f877ed..69f877ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3315874.h
index 58921bc5..58921bc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf557.cpp
index c7ba93cc..c7ba93cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf567.cpp
index 0c1d5fc9..0c1d5fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf574.cpp
index 3f5a98d4..3f5a98d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf583.cpp
index 8eba4d1e..8eba4d1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf593.cpp
index 1fc0ded8..1fc0ded8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sim.h
index 29c52879..29c52879 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_constr_colon.cpp
index caea467a..caea467a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_decltype.cpp
index 18448555..18448555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_type.cpp
index 6f235d22..6f235d22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_angle_paren.cpp
index 911aa53b..911aa53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_arith_additive.cpp
index ab2096c8..ab2096c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_balance_nested_parens.cpp
index dc5f5e8e..dc5f5e8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_byref_func.cpp
index 7dd9c14a..7dd9c14a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_case_colon.cpp
index 0c534fe0..0c534fe0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_case_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_case_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_constr_colon.cpp
index 796522c7..796522c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
index 45ffb335..45ffb335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_brace.cpp
index bb730d61..bb730d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_catch.cpp
index 7b4bdc5e..7b4bdc5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_catch.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_catch.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_region.cpp
index b70ef6b1..b70ef6b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_start.cc
index 6a9b203b..6a9b203b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cond_question.cpp
index cec6c827..cec6c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cparen_oparen.cpp
index 83c60dd4..83c60dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
index e25d0496..e25d0496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_decltype.cpp
index 3e2f7e47..3e2f7e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_endif_cmt.cpp
index 9e5b2db8..9e5b2db8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_endif_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_endif_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_assign.cpp
index 2ebab438..2ebab438 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_colon.cpp
index a23c6afd..a23c6afd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_func_call_paren.cpp
index 90798ef9..90798ef9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_inside_braces_enum.cpp
index 8386e215..8386e215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_not_not.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_not_not.cpp
index 4ef7f777..4ef7f777 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_not_not.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_not_not.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_paren_brace.cpp
index 4ac73f87..4ac73f87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
index fff4aff4..fff4aff4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_throw_paren.cpp
index f45f1a9a..f45f1a9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_type_func.cpp
index 30e058e7..30e058e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/squeeze_ifdef.cpp
index 42699d1d..42699d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/stdcall.cpp
index a2353599..a2353599 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/stdcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/stdcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/string_replace_tab_chars.cpp
index 3534461b..3534461b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/strings.cpp
index 1cfea449..1cfea449 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-0.cpp
index 474aba08..474aba08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-1.cpp
index dc7a65c4..dc7a65c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templ_class.h
index 0f102244..0f102244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates.cpp
index 737599bf..737599bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates2.cpp
index 46d41560..46d41560 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates3.cpp
index 55b11d26..55b11d26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/throws.cpp
new file mode 100644
index 00000000..0419fc77
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/throws.cpp
@@ -0,0 +1,17 @@
+int main()
+{
+	throw("error");
+
+	throw  ("error");
+
+	throw"error";
+
+	throw "error";
+
+	throw
+	"error";
+
+	throw
+
+	"error";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt.cpp
index 6f49594d..6f49594d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt2.cpp
index 6b4a0a39..6b4a0a39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return.cpp
index b5903ce9..b5903ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return_byref_ptr.cpp
index 14cffd63..14cffd63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return_byref_ptr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return_byref_ptr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/try-catch-nl.cpp
index 447f3cbd..447f3cbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/type_brace_init_lst.cpp
index 53e74de2..53e74de2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/uniform_initialization.cpp
index 37a131e0..37a131e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/using-alias-in-define.cpp
index 82854287..82854287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/cpp/var_def_blks.cpp
new file mode 100644
index 00000000..aa76a9e8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/var_def_blks.cpp
@@ -0,0 +1,31 @@
+unsigned a;
+char b;
+int bar(void);
+unsigned c;
+char d;
+int foo(void) {
+    char buf[1000] = {0};
+    size_t len;
+    float amount;
+    double remainder;
+    bar();
+    uint64_t quux;
+    uint64_t quack;
+    for (int i = 0; i < 1000; i++) {
+        uint64_t checksum;
+        double remainder;
+        buf[i] += len;
+        uint32_t xyzzy;
+        uint32_t quark;
+    }
+    float amount;
+    double remainder;
+    baz();
+    uint32_t llama;
+    uint32_t treehouse;
+}
+char * w;
+uint8_t x;
+int baz(void);
+long y;
+int z;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/var_def_gap.cpp
index 0cca962b..0cca962b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/variadic-template.h
index f522097c..f522097c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/wacky-template.cpp
index 99e01b6e..99e01b6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/1822.cs
index a4269bd9..a4269bd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/615_nested-usings.cs
index 14a31507..14a31507 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/620_getset-brace.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/625_where-constraints.cs
index 09274ab9..09274ab9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/Issue_2705.cs
index 9a1b3172..9a1b3172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11662.cs
index 9a49fdba..9a49fdba 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11993.cs
index 6bc6529a..6bc6529a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-12303.cs
index 01be8291..01be8291 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1288.cs
index 70554a02..70554a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1338.cs
index d10b4893..d10b4893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1343.cs
index 852fe640..852fe640 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1345.cs
index e218e6a2..e218e6a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-13955.cs
index 940aa89b..940aa89b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-14131.cs
index c8c3c918..c8c3c918 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-17253.cs
index 7342d82c..7342d82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18437.cs
index aab6c498..aab6c498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18780.cs
index 0eea713e..0eea713e 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18829.cs
index 62c9f8fb..62c9f8fb 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1919.cs
index 956fd0f8..956fd0f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19644.cs
index da76bfbc..da76bfbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1975.cs
index af678a93..af678a93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1977.cs
index e4b1b375..e4b1b375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1978.cs
index 14cbdc7d..14cbdc7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19895.cs
index a22c6fa8..a22c6fa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2007.cs
index 2e9f163a..2e9f163a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2008.cs
index eeb649dd..eeb649dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2020.cs
index 37d9ef23..37d9ef23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2021.cs
index 2b08fafe..2b08fafe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2506.cs
index 7bdbb81a..7bdbb81a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2684.cs
index 0c91b081..0c91b081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2685.cs
index 4c11f20b..4c11f20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-29933.cs
index ed96bc87..ed96bc87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-30498_2.cs
index ba0d8515..ba0d8515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3484.cs
index 1235aa91..1235aa91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-36862.cs
index cb3cb448..cb3cb448 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-36862.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-36862.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-37241.cs
index b2097c4f..b2097c4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-40685.cs
index a2f37547..a2f37547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-9917.cs
index 5bd9dc64..5bd9dc64 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/add-nl-before-namespace.cs
index 93a2cf04..93a2cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1620.cs
index 0c9d4eb9..0c9d4eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1637.cs
index 1f46d1bc..1f46d1bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1650.cs
index 5c52aece..5c52aece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_600.cs
index 3d93d861..3d93d861 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_620.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_935.cs
index d2c8ec95..d2c8ec95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_935.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/cast.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cast.cs
index 77761b89..77761b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/cast.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cast.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/comma.cs
index 794410f0..794410f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/delegate.cs
index 3a4b103c..3a4b103c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/exception-filters.cs
index 1e3abca3..1e3abca3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/fncall_as_ctor_in_attr.cs
index cf52b46f..cf52b46f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/generics.cs
index 7bbe04c7..7bbe04c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/getset.cs
index 59aaa5bc..59aaa5bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/gs.cs
index 16adc604..16adc604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcolalign.cs
index d2e40c78..d2e40c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcomment.cs
index 6663a6ca..6663a6ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/indent-multistring-coulmn1.cs
index 56bdf473..56bdf473 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mdarray_space.cs
index e5338c11..e5338c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/misc-failures.cs
index 857c06f9..857c06f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
index f8db4f0b..f8db4f0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/new-constraint-paren-space.cs
index 209f2721..209f2721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/oneline_property.cs
index 1d7a2c26..1d7a2c26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator-null-conditional.cs
index 530bdd27..530bdd27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/property.cs
index 85e08bae..85e08bae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/region.cs
index 4f8667f2..4f8667f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/remove_semi.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf607.cs
index f0617c19..f0617c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf628.cs
index 803c9962..803c9962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/simple.cs
index 30acd134..30acd134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using.cs
index 881b4d5b..881b4d5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using_categ.cs
index 173e42bb..173e42bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sp_between_new_paren.cs
index f5d8381d..f5d8381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/squeeze-paren-close-Option.cs
index 37203f4a..37203f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/string_multi.cs
index 9e715e51..9e715e51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/tcf.cs
index f3ac3664..f3ac3664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/unsafe.cs
index 5dc90cb4..5dc90cb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be.cs
index 13da3090..13da3090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be_no_bom.cs
index 33587b97..33587b97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le.cs
index 3f16b9d0..3f16b9d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le_no_bom.cs
index 4a7f9ccc..4a7f9ccc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/var-member.cs
index 0f7ffb23..0f7ffb23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/verbatim_strings.cs
index 47c3ed4c..47c3ed4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/when.cs
index 2785b894..2785b894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/1438.d
index 10a43753..10a43753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/HashMap.d
index 618b3e59..618b3e59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/HashMap.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/Lexer.d
index 004d9d8a..004d9d8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/bug-indent.d
index 321ab6f1..321ab6f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/casts.d
index 42d54916..42d54916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/const.d
index 778957fd..778957fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/d_sp_paren.d
index 2b28a7f1..2b28a7f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/delegate.d
index 0115ae00..0115ae00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/delegate.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/enum.d
index 804ef27c..804ef27c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/extern_.d
index a583b08e..a583b08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/funcfunc.d
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/imports.d
index 758fefb7..758fefb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/invariant.d
index 46a8efdc..46a8efdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/numbers.d
index e51bf8ac..e51bf8ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/sort_import.d
index d929f8e8..d929f8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/square_indent_tab.d
index 1dee3a17..1dee3a17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if.d
index 24e6eaba..24e6eaba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/strings.d
index a62adec3..a62adec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template.d
index fe5a162c..fe5a162c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing001.d
index 745e5b36..745e5b36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst01.d
index 3a3728f2..3a3728f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst01.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst02.d
index 0b428d60..0b428d60 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst03.d
index 611f12f9..611f12f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces000.d
index d2f1b642..d2f1b642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces001.d
index a59ab020..a59ab020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces002.d
index 5e45e999..5e45e999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-1.d
index c9f41d3f..c9f41d3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile.d
index c42d1893..c42d1893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/ecma/example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/ecma/example-1.es
index 0bc9b775..0bc9b775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/ecma/example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/ecma/example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1122.java
index 5712f9ee..5712f9ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1124.java
index dcea4172..dcea4172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1845.java
index cc7656ba..cc7656ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_670.java
index 52d64f1e..52d64f1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation1.java
index d7417542..d7417542 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation2.java
index 596c2562..596c2562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/assert.java
index 8076663b..8076663b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/cast.java
index 8f2d983b..8f2d983b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/double_brace.java
index 8ba15c47..8ba15c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/doxy-javadoc-alignment.java
index 838d765c..838d765c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/doxy-javadoc-alignment.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/doxy-javadoc-alignment.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/foreach.java
index e475dc29..e475dc29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics.java
index 729013ce..729013ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_return_type.java
index 818ac721..818ac721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/issue_672.java
index 2f632625..2f632625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/long_cl_cmt.java
index 45e5252b..45e5252b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/nl_before_ignore_after_case.java
index a84e8847..a84e8847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/nl_before_ignore_after_case.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/nl_before_ignore_after_case.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sf567.java
index 68a63221..68a63221 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_angle.java
index 1e11c4c9..1e11c4c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_for_colon.java
index fecd1833..fecd1833 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_this_paren.java
index 628b327f..628b327f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/synchronized.java
index 369394b8..369394b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/try.java
index aea6a7f3..aea6a7f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/variable_aligns.java
index 76c6131c..76c6131c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/1927.m
index 9f8d7a7b..9f8d7a7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/oc/3766.m
new file mode 100644
index 00000000..b9c06cee
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3766.m
@@ -0,0 +1,15 @@
+void test(NSString *             param1, void (^_Nullable completionBlock)(int));
+
+void test(NSString * param1, void (^_Nullable completionBlock)(int));
+
+void test(void (^_Nullable completionBlock)(int), NSString *param1);
+
+void test(void (^_Nullable completionBlock)(int), NSString *param1, void (^_Nullable completionBlock)(int));
+
+void test(
+	void (^_Nullable completionBlock)(int),
+	NSString * param1,
+	void (^_Nullable completionBlock)(int)
+	);
+
+void test(NSString *param1, void (^_Nullable completionBlock)(NSString *, NSString *, void (^_Nullable completionBlock2)(int)));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3767.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3767.mm
new file mode 100644
index 00000000..2ff485f2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3767.mm
@@ -0,0 +1,7 @@
+const auto test = [ = ] (NSString *param) {};
+const auto test =       [&](NSString *param) {};
+const auto test = []           (NSString *param) {};
+func([=](NSString *     param) {});
+func([&](NSString *param) {});
+func([](NSString *param) {});
+func(param1, [=](NSString *param) {});
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3811.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3811.mm
new file mode 100644
index 00000000..4510b8c2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3811.mm
@@ -0,0 +1,6 @@
+int main()
+{
+  test([](enum TestEnum lhs) {
+    return lhs.first < rhs;
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3812.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3812.m
new file mode 100644
index 00000000..acea28c0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3812.m
@@ -0,0 +1,8 @@
+- (int)test
+{
+  [obj method:[obj2 method2:@{}]];
+  switch (var) {
+    case one: return 3;
+  }
+  return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3813.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3813.m
new file mode 100644
index 00000000..37e9239f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3813.m
@@ -0,0 +1,20 @@
+- (void)func {
+  func2(^{
+    switch (type) {
+      case one:
+        break;
+      default:
+        break;
+    }
+  });
+}
+
+- (void)func {
+  func2(^{
+    if(YES) {
+      switch (type) {
+        case one: break;
+      }
+    }
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3819.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3819.m
new file mode 100644
index 00000000..2a34b1c3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3819.m
@@ -0,0 +1 @@
+#if __has_include(<UIKit/UIImage.h>)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3822.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3822.h
new file mode 100644
index 00000000..e0f113e1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3822.h
@@ -0,0 +1,5 @@
+@interface FooInterface : UIViewController
+
+@property (nonatomic, readwrite, weak) id<FooProtocol> delegate;
+
+@end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3823.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3823.m
new file mode 100644
index 00000000..9c110935
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3823.m
@@ -0,0 +1,6 @@
+void (^(^complexBlock)(void (^)(void)))(void) = ^(void (^aBlock)(void)) {
+  NSLog(@"Good");
+  return ^{
+    NSLog(@"Nice");
+  };
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Declarations.h
index e1ad3c6b..e1ad3c6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.h
index 364b1de8..364b1de8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.m
index 20994f34..20994f34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2172.m
index 02584e91..02584e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2289.m
index c046cb1e..c046cb1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_681.oc
index fb4c6685..fb4c6685 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-11095.mm
index 34ed4050..34ed4050 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-1333.mm
index 5c91693c..5c91693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-1333.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align-objc-like-xcode.m
index 6852ac12..6852ac12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/oc/align_colon_with_ternary_1.m
new file mode 100644
index 00000000..ddee5abb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align_colon_with_ternary_1.m
@@ -0,0 +1,48 @@
+static void func() {
+    [object test:NO ? PARAM1 : PARAM2
+     test2:YES];
+}
+
+static void func() {
+    [object test:NO ? PARAM1 : PARAM2
+    test2:YES
+           test3:YES];
+}
+
+static void func() {
+    [object test:NO ? PARAM1 : PARAM2
+    test2:YES
+           test3:YES ? PARAM1 : PARAM2
+           test4:NO];
+}
+
+static void func() {
+    [object test:NO ? PARAM1 : YES
+    ? nil:nil
+    test2:YES
+           test3:YES ? PARAM1 : PARAM2
+           test4:NO];
+}
+
+// Note: This is an extreme case and in the future we may add rules that update this formatting
+static void func() {
+    NSString *s = YES ? [object test:NO ? PARAM1 : YES
+    ? nil:nil
+    test2:YES
+           test3:YES ? PARAM1 : PARAM2
+           test4:NO] : [object test:NO ? PARAM1 : YES
+    ? nil:nil
+    test2:YES
+           test3:YES ? PARAM1 : PARAM2
+           test4:NO];
+}
+
+static void func() {
+	NSString *s = YES ? [object test:NO ? PARAM1 : YES ? nil : nil
+	                           test2:YES
+	                           test3:YES ? PARAM1 : PARAM2
+	                           test4:NO] : [object test:NO ? PARAM1 : YES ? nil : nil
+	                                              test2:YES
+	                                              test3:YES ? PARAM1 : PARAM2
+	                                              test4:NO];
+}
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.76.0/tests/input/oc/align_colon_with_ternary_2.m
new file mode 100644
index 00000000..b5e5669a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align_colon_with_ternary_2.m
@@ -0,0 +1,20 @@
+static void func() {
+    [object test:NO ? PARAM1 : PARAM2 test2:YES];
+}
+
+
+static void func() {
+    [object test:NO ? PARAM1 : PARAM2 test2:YES test3:YES];
+}
+
+static void func() {
+    [object test:NO ? PARAM1 : PARAM2 test2:YES test3:YES ? PARAM1 : PARAM2 test4:NO];
+}
+
+static void func() {
+    [object test:NO ? PARAM1 : YES ? nil:nil test2:YES test3:YES ? PARAM1 : PARAM2 test4:NO];
+}
+
+static void func() {
+	NSString *s = YES ? [object test:nil test2:YES test3:nil test4:NO] : nil;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/argtypes.mm
index fd2ff142..fd2ff142 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/asm.h.mm
index 97c0edd3..97c0edd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/attribute_specifier_seqs.mm
index c9b6f24d..c9b6f24d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/available.m
index 8216d17f..8216d17f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_in_method.m
index e0dfcd76..e0dfcd76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_literal_protocol.m
index 02d1cfca..02d1cfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_pointer.m
index 9c7ac70b..9c7ac70b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_pointer.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_pointer.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks.m
index 617e0b78..617e0b78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align.m
index 2ddf75c6..2ddf75c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align2.m
index f4e875c9..f4e875c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/box.m
index 98a3516a..98a3516a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/boxed_receiver.m
index 3460b920..3460b920 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1366.m
index 5e81ed4a..5e81ed4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_167.m
index e404e2aa..e404e2aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1674.m
index 82c20161..82c20161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_340.m
index ea9f8201..ea9f8201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_404.m
index 3ecb87f0..3ecb87f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_497.m
index a976d43d..a976d43d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_841.m
index dea826d2..dea826d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_125-412.m
index c92d2e66..c92d2e66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_408.m
index c8a3a450..c8a3a450 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_477.m
index a1a81749..a1a81749 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/c-cpp-oc-wrapper.c
index 663a4cc8..663a4cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cast.m
index daa9cb6d..daa9cb6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/casting.mm
index c8022c7b..c8022c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type2.m
index 27e31cdc..27e31cdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type3.m
index 8d8676c8..8d8676c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert.m
index 58a4c894..58a4c894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert2.m
index 4a31e975..4a31e975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/code_placeholder.m
index 6245bfa4..6245bfa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/complex_method.m
index b22c34b6..b22c34b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/definesalign.h.mm
index a249d1aa..a249d1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/delete-space-oc.mm
index 66e24dc8..66e24dc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double-indent-objc-dict.m
index f94e5105..f94e5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double_angle_space.m
index f7164498..f7164498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/exceptions.m
index c8d6f6f2..c8d6f6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/extern-c-attribute.m
index fb84ce73..fb84ce73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for.m
index fc159fc6..fc159fc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func_def.mm
index b3655728..b3655728 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh137.m
index 779e0f2f..779e0f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh293.m
index bb4cb52c..bb4cb52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh511.m
index cee32794..cee32794 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-inside-ternary-operator.m
index ff979acf..ff979acf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-inside-ternary-operator.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-objc-block.m
index b882abf5..b882abf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_boxed.m
index c7df968f..c7df968f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_oc_inside_msg_sel.m
index f20cd048..f20cd048 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_single_newline.m
index 27e79e8a..27e79e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/inttypes.h.mm
index 6e093789..6e093789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2629.m
index e690ea58..e690ea58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2631.m
index 7989b020..7989b020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2675.m
index 1d4cafe2..1d4cafe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2722.m
index 65dcb131..65dcb131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2724.m
index 51c90671..51c90671 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2727.m
index f15542f1..f15542f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_3031.mm
index 028d55d9..028d55d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_3031.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_3031.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/kw.m
index a4d25624..a4d25624 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/literals.mm
index 98522f3d..98522f3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/literals.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/literals.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/main.m
index f2fdf16a..f2fdf16a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/method_ends_semicolon.m
index e3c5637e..e3c5637e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/misc.m
index 5038a14c..5038a14c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks.m
index eab01db0..8695ffdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks.m
@@ -14,6 +14,7 @@ void AllLinesInFile(char *f, vstr_t block) {
     FILE *fp = fopen(f, "r"); 
     if (!fp) return; 
     char line[1024]; 
+
     while (fgets(line, 1024, fp))
         block(line); 
     fclose(fp);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks_2.m
index 55636ae5..55636ae5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg.m
index cca460f9..cca460f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg_align.m
index 3b61a051..3b61a051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/newlines.mm
index 31a46376..31a46376 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/newlines.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
index ea132bab..ea132bab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/oc/nl_oc_msg_args_max_code_width.m
new file mode 100644
index 00000000..aa093dfd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_oc_msg_args_max_code_width.m
@@ -0,0 +1,19 @@
+static void function() {
+    [object param1:nil param2:nil param3:nil param4:nil];
+
+    [object param1:nil param2:nil param3:nil];
+
+    [object param1:nil param2:nil];
+
+    [object param1:nil];
+
+    [object func];
+
+    [obj param1:nil param2:nil param3:[obj2 param1:nil param2:nil]];
+
+    [obj param1:nil
+         param2:[obj2 param1:nil param2:nil param3:nil param4:nil param5:nil param6:nil]
+         param3:nil];
+
+    [obj param1:nil param2:[obj2 param1:nil param2:nil param3:nil param4:nil param5:nil param6:nil] param3:nil];
+}
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.76.0/tests/input/oc/nl_oc_msg_args_min_params.m
new file mode 100644
index 00000000..aa093dfd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_oc_msg_args_min_params.m
@@ -0,0 +1,19 @@
+static void function() {
+    [object param1:nil param2:nil param3:nil param4:nil];
+
+    [object param1:nil param2:nil param3:nil];
+
+    [object param1:nil param2:nil];
+
+    [object param1:nil];
+
+    [object func];
+
+    [obj param1:nil param2:nil param3:[obj2 param1:nil param2:nil]];
+
+    [obj param1:nil
+         param2:[obj2 param1:nil param2:nil param3:nil param4:nil param5:nil param6:nil]
+         param3:nil];
+
+    [obj param1:nil param2:[obj2 param1:nil param2:nil param3:nil param4:nil param5:nil param6:nil] param3:nil];
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum-i.m
index e5caad06..e5caad06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum-i.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum-i.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum.m
index cdd729d8..cdd729d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/objc.mm
index 7f0e706a..7f0e706a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc-split.m
index 3b656bfc..3b656bfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc_cond_colon.m
index 50cf56b5..50cf56b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/oc/ocpp_msg_access.mm
new file mode 100644
index 00000000..e5a4091f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ocpp_msg_access.mm
@@ -0,0 +1,4 @@
+NSValue *result = [anObject
+                   public:value1
+                   argument:arg
+                   signals:value2];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp-ignore.mm
index 2673008c..2673008c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/properties.m
index 4de60057..4de60057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/protocol.m
index 31a8b86f..31a8b86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/react_native.m
index eadf314f..eadf314f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/react_native.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/react_native.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/real_world_file.m
index 26ec3cb2..26ec3cb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/real_world_file.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/receiver.m
index 274d4130..274d4130 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/return_type.m
index 62a5c246..62a5c246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/selector.m
index a5a89475..a5a89475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import.m
index 1a227b7e..1a227b7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import_group.m
index 9e14f0fc..9e14f0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/oc/sort_import_group_regex.mm
new file mode 100644
index 00000000..38d8aa29
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import_group_regex.mm
@@ -0,0 +1,1024 @@
+#import <UIKit/UIView.h>
+#import <UIKit/UIViewController.h>
+#import <UIKit/UIStackView.h>
+#import <UIKit/UIControl.h>
+#import <UIKit/UIPickerView.h>
+#import <UIKit/UIButton.h>
+#import <UIKit/UIDatePicker.h>
+#import <UIKit/UISegmentedControl.h>
+#import <UIKit/UISlider.h>
+#import <UIKit/UISwitch.h>
+#import <UIKit/UIStepper.h>
+#import <UIKit/UILabel.h>
+#import <UIKit/UITextField.h>
+#import <UIKit/UITextView.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSNumber.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSURL.h>
+#import <Foundation/NSUUID.h>
+#import <ObjCFramework/FrameworkFile001.h>
+#import <CPPFramework/FrameworkFile001.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-001.h>
+#import <ObjCFramework/FrameworkFile002.h>
+#import <CPPFramework/FrameworkFile002.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-002.h>
+#import <ObjCFramework/FrameworkFile003.h>
+#import <CPPFramework/FrameworkFile003.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-003.h>
+#import <ObjCFramework/FrameworkFile004.h>
+#import <CPPFramework/FrameworkFile004.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-004.h>
+#import <ObjCFramework/FrameworkFile005.h>
+#import <CPPFramework/FrameworkFile005.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-005.h>
+#import <ObjCFramework/FrameworkFile006.h>
+#import <CPPFramework/FrameworkFile006.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-006.h>
+#import <ObjCFramework/FrameworkFile007.h>
+#import <CPPFramework/FrameworkFile007.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-007.h>
+#import <ObjCFramework/FrameworkFile008.h>
+#import <CPPFramework/FrameworkFile008.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-008.h>
+#import <ObjCFramework/FrameworkFile009.h>
+#import <CPPFramework/FrameworkFile009.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-009.h>
+#import <ObjCFramework/FrameworkFile010.h>
+#import <CPPFramework/FrameworkFile010.hpp>
+#import <CPPFramework/FrameworkFile-LowPriority-010.h>
+#import "File001.h"
+#import "File002.h"
+#import "File003.h"
+#import "File004.h"
+#import "File005.h"
+#import "File006.h"
+#import "File007.h"
+#import "File008.h"
+#import "File009.h"
+#import "File010.h"
+#import "File011.h"
+#import "File012.h"
+#import "File013.h"
+#import "File014.h"
+#import "File015.h"
+#import "File016.h"
+#import "File017.h"
+#import "File018.h"
+#import "File019.h"
+#import "File020.h"
+#import "File021.h"
+#import "File022.h"
+#import "File023.h"
+#import "File024.h"
+#import "File025.h"
+#import "File026.h"
+#import "File027.h"
+#import "File028.h"
+#import "File029.h"
+#import "File030.h"
+#import "File031.h"
+#import "File032.h"
+#import "File033.h"
+#import "File034.h"
+#import "File035.h"
+#import "File036.h"
+#import "File037.h"
+#import "File038.h"
+#import "File039.h"
+#import "File040.h"
+#import "File041.h"
+#import "File042.h"
+#import "File043.h"
+#import "File044.h"
+#import "File045.h"
+#import "File046.h"
+#import "File047.h"
+#import "File048.h"
+#import "File049.h"
+#import "File050.h"
+#import "File051.h"
+#import "File052.h"
+#import "File053.h"
+#import "File054.h"
+#import "File055.h"
+#import "File056.h"
+#import "File057.h"
+#import "File058.h"
+#import "File059.h"
+#import "File060.h"
+#import "File061.h"
+#import "File062.h"
+#import "File063.h"
+#import "File064.h"
+#import "File065.h"
+#import "File066.h"
+#import "File067.h"
+#import "File068.h"
+#import "File069.h"
+#import "File070.h"
+#import "File071.h"
+#import "File072.h"
+#import "File073.h"
+#import "File074.h"
+#import "File075.h"
+#import "File076.h"
+#import "File077.h"
+#import "File078.h"
+#import "File079.h"
+#import "File080.h"
+#import "File081.h"
+#import "File082.h"
+#import "File083.h"
+#import "File084.h"
+#import "File085.h"
+#import "File086.h"
+#import "File087.h"
+#import "File088.h"
+#import "File089.h"
+#import "File090.h"
+#import "File091.h"
+#import "File092.h"
+#import "File093.h"
+#import "File094.h"
+#import "File095.h"
+#import "File096.h"
+#import "File097.h"
+#import "File098.h"
+#import "File099.h"
+#import "File100.h"
+#import "File101.h"
+#import "File102.h"
+#import "File103.h"
+#import "File104.h"
+#import "File105.h"
+#import "File106.h"
+#import "File107.h"
+#import "File108.h"
+#import "File109.h"
+#import "File110.h"
+#import "File111.h"
+#import "File112.h"
+#import "File113.h"
+#import "File114.h"
+#import "File115.h"
+#import "File116.h"
+#import "File117.h"
+#import "File118.h"
+#import "File119.h"
+#import "File120.h"
+#import "File121.h"
+#import "File122.h"
+#import "File123.h"
+#import "File124.h"
+#import "File125.h"
+#import "File126.h"
+#import "File127.h"
+#import "File128.h"
+#import "File129.h"
+#import "File130.h"
+#import "File131.h"
+#import "File132.h"
+#import "File133.h"
+#import "File134.h"
+#import "File135.h"
+#import "File136.h"
+#import "File137.h"
+#import "File138.h"
+#import "File139.h"
+#import "File140.h"
+#import "File141.h"
+#import "File142.h"
+#import "File143.h"
+#import "File144.h"
+#import "File145.h"
+#import "File146.h"
+#import "File147.h"
+#import "File148.h"
+#import "File149.h"
+#import "File150.h"
+#import "File151.h"
+#import "File152.h"
+#import "File153.h"
+#import "File154.h"
+#import "File155.h"
+#import "File156.h"
+#import "File157.h"
+#import "File158.h"
+#import "File159.h"
+#import "File160.h"
+#import "File161.h"
+#import "File162.h"
+#import "File163.h"
+#import "File164.h"
+#import "File165.h"
+#import "File166.h"
+#import "File167.h"
+#import "File168.h"
+#import "File169.h"
+#import "File170.h"
+#import "File171.h"
+#import "File172.h"
+#import "File173.h"
+#import "File174.h"
+#import "File175.h"
+#import "File176.h"
+#import "File177.h"
+#import "File178.h"
+#import "File179.h"
+#import "File180.h"
+#import "File181.h"
+#import "File182.h"
+#import "File183.h"
+#import "File184.h"
+#import "File185.h"
+#import "File186.h"
+#import "File187.h"
+#import "File188.h"
+#import "File189.h"
+#import "File190.h"
+#import "File191.h"
+#import "File192.h"
+#import "File193.h"
+#import "File194.h"
+#import "File195.h"
+#import "File196.h"
+#import "File197.h"
+#import "File198.h"
+#import "File199.h"
+#import "File200.h"
+#import "File201.h"
+#import "File202.h"
+#import "File203.h"
+#import "File204.h"
+#import "File205.h"
+#import "File206.h"
+#import "File207.h"
+#import "File208.h"
+#import "File209.h"
+#import "File210.h"
+#import "File211.h"
+#import "File212.h"
+#import "File213.h"
+#import "File214.h"
+#import "File215.h"
+#import "File216.h"
+#import "File217.h"
+#import "File218.h"
+#import "File219.h"
+#import "File220.h"
+#import "File221.h"
+#import "File222.h"
+#import "File223.h"
+#import "File224.h"
+#import "File225.h"
+#import "File226.h"
+#import "File227.h"
+#import "File228.h"
+#import "File229.h"
+#import "File230.h"
+#import "File231.h"
+#import "File232.h"
+#import "File233.h"
+#import "File234.h"
+#import "File235.h"
+#import "File236.h"
+#import "File237.h"
+#import "File238.h"
+#import "File239.h"
+#import "File240.h"
+#import "File241.h"
+#import "File242.h"
+#import "File243.h"
+#import "File244.h"
+#import "File245.h"
+#import "File246.h"
+#import "File247.h"
+#import "File248.h"
+#import "File249.h"
+#import "File250.h"
+#import "File251.h"
+#import "File252.h"
+#import "File253.h"
+#import "File254.h"
+#import "File255.h"
+#import "File256.h"
+#import "File257.h"
+#import "File258.h"
+#import "File259.h"
+#import "File260.h"
+#import "File261.h"
+#import "File262.h"
+#import "File263.h"
+#import "File264.h"
+#import "File265.h"
+#import "File266.h"
+#import "File267.h"
+#import "File268.h"
+#import "File269.h"
+#import "File270.h"
+#import "File271.h"
+#import "File272.h"
+#import "File273.h"
+#import "File274.h"
+#import "File275.h"
+#import "File276.h"
+#import "File277.h"
+#import "File278.h"
+#import "File279.h"
+#import "File280.h"
+#import "File281.h"
+#import "File282.h"
+#import "File283.h"
+#import "File284.h"
+#import "File285.h"
+#import "File286.h"
+#import "File287.h"
+#import "File288.h"
+#import "File289.h"
+#import "File290.h"
+#import "File291.h"
+#import "File292.h"
+#import "File293.h"
+#import "File294.h"
+#import "File295.h"
+#import "File296.h"
+#import "File297.h"
+#import "File298.h"
+#import "File299.h"
+#import "File300.h"
+#import "File301.h"
+#import "File302.h"
+#import "File303.h"
+#import "File304.h"
+#import "File305.h"
+#import "File306.h"
+#import "File307.h"
+#import "File308.h"
+#import "File309.h"
+#import "File310.h"
+#import "File311.h"
+#import "File312.h"
+#import "File313.h"
+#import "File314.h"
+#import "File315.h"
+#import "File316.h"
+#import "File317.h"
+#import "File318.h"
+#import "File319.h"
+#import "File320.h"
+#import "File321.h"
+#import "File322.h"
+#import "File323.h"
+#import "File324.h"
+#import "File325.h"
+#import "File326.h"
+#import "File327.h"
+#import "File328.h"
+#import "File329.h"
+#import "File330.h"
+#import "File331.h"
+#import "File332.h"
+#import "File333.h"
+#import "File334.h"
+#import "File335.h"
+#import "File336.h"
+#import "File337.h"
+#import "File338.h"
+#import "File339.h"
+#import "File340.h"
+#import "File341.h"
+#import "File342.h"
+#import "File343.h"
+#import "File344.h"
+#import "File345.h"
+#import "File346.h"
+#import "File347.h"
+#import "File348.h"
+#import "File349.h"
+#import "File350.h"
+#import "File351.h"
+#import "File352.h"
+#import "File353.h"
+#import "File354.h"
+#import "File355.h"
+#import "File356.h"
+#import "File357.h"
+#import "File358.h"
+#import "File359.h"
+#import "File360.h"
+#import "File361.h"
+#import "File362.h"
+#import "File363.h"
+#import "File364.h"
+#import "File365.h"
+#import "File366.h"
+#import "File367.h"
+#import "File368.h"
+#import "File369.h"
+#import "File370.h"
+#import "File371.h"
+#import "File372.h"
+#import "File373.h"
+#import "File374.h"
+#import "File375.h"
+#import "File376.h"
+#import "File377.h"
+#import "File378.h"
+#import "File379.h"
+#import "File380.h"
+#import "File381.h"
+#import "File382.h"
+#import "File383.h"
+#import "File384.h"
+#import "File385.h"
+#import "File386.h"
+#import "File387.h"
+#import "File388.h"
+#import "File389.h"
+#import "File390.h"
+#import "File391.h"
+#import "File392.h"
+#import "File393.h"
+#import "File394.h"
+#import "File395.h"
+#import "File396.h"
+#import "File397.h"
+#import "File398.h"
+#import "File399.h"
+#import "File400.h"
+#import "File401.h"
+#import "File402.h"
+#import "File403.h"
+#import "File404.h"
+#import "File405.h"
+#import "File406.h"
+#import "File407.h"
+#import "File408.h"
+#import "File409.h"
+#import "File410.h"
+#import "File411.h"
+#import "File412.h"
+#import "File413.h"
+#import "File414.h"
+#import "File415.h"
+#import "File416.h"
+#import "File417.h"
+#import "File418.h"
+#import "File419.h"
+#import "File420.h"
+#import "File421.h"
+#import "File422.h"
+#import "File423.h"
+#import "File424.h"
+#import "File425.h"
+#import "File426.h"
+#import "File427.h"
+#import "File428.h"
+#import "File429.h"
+#import "File430.h"
+#import "File431.h"
+#import "File432.h"
+#import "File433.h"
+#import "File434.h"
+#import "File435.h"
+#import "File436.h"
+#import "File437.h"
+#import "File438.h"
+#import "File439.h"
+#import "File440.h"
+#import "File441.h"
+#import "File442.h"
+#import "File443.h"
+#import "File444.h"
+#import "File445.h"
+#import "File446.h"
+#import "File447.h"
+#import "File448.h"
+#import "File449.h"
+#import "File450.h"
+#import "File451.h"
+#import "File452.h"
+#import "File453.h"
+#import "File454.h"
+#import "File455.h"
+#import "File456.h"
+#import "File457.h"
+#import "File458.h"
+#import "File459.h"
+#import "File460.h"
+#import "File461.h"
+#import "File462.h"
+#import "File463.h"
+#import "File464.h"
+#import "File465.h"
+#import "File466.h"
+#import "File467.h"
+#import "File468.h"
+#import "File469.h"
+#import "File470.h"
+#import "File471.h"
+#import "File472.h"
+#import "File473.h"
+#import "File474.h"
+#import "File475.h"
+#import "File476.h"
+#import "File477.h"
+#import "File478.h"
+#import "File479.h"
+#import "File480.h"
+#import "File481.h"
+#import "File482.h"
+#import "File483.h"
+#import "File484.h"
+#import "File485.h"
+#import "File486.h"
+#import "File487.h"
+#import "File488.h"
+#import "File489.h"
+#import "File490.h"
+#import "File491.h"
+#import "File492.h"
+#import "File493.h"
+#import "File494.h"
+#import "File495.h"
+#import "File496.h"
+#import "File497.h"
+#import "File498.h"
+#import "File499.h"
+#import "File500.h"
+#import "File501.h"
+#import "File502.h"
+#import "File503.h"
+#import "File504.h"
+#import "File505.h"
+#import "File506.h"
+#import "File507.h"
+#import "File508.h"
+#import "File509.h"
+#import "File510.h"
+#import "File511.h"
+#import "File512.h"
+#import "File513.h"
+#import "File514.h"
+#import "File515.h"
+#import "File516.h"
+#import "File517.h"
+#import "File518.h"
+#import "File519.h"
+#import "File520.h"
+#import "File521.h"
+#import "File522.h"
+#import "File523.h"
+#import "File524.h"
+#import "File525.h"
+#import "File526.h"
+#import "File527.h"
+#import "File528.h"
+#import "File529.h"
+#import "File530.h"
+#import "File531.h"
+#import "File532.h"
+#import "File533.h"
+#import "File534.h"
+#import "File535.h"
+#import "File536.h"
+#import "File537.h"
+#import "File538.h"
+#import "File539.h"
+#import "File540.h"
+#import "File541.h"
+#import "File542.h"
+#import "File543.h"
+#import "File544.h"
+#import "File545.h"
+#import "File546.h"
+#import "File547.h"
+#import "File548.h"
+#import "File549.h"
+#import "File550.h"
+#import "File551.h"
+#import "File552.h"
+#import "File553.h"
+#import "File554.h"
+#import "File555.h"
+#import "File556.h"
+#import "File557.h"
+#import "File558.h"
+#import "File559.h"
+#import "File560.h"
+#import "File561.h"
+#import "File562.h"
+#import "File563.h"
+#import "File564.h"
+#import "File565.h"
+#import "File566.h"
+#import "File567.h"
+#import "File568.h"
+#import "File569.h"
+#import "File570.h"
+#import "File571.h"
+#import "File572.h"
+#import "File573.h"
+#import "File574.h"
+#import "File575.h"
+#import "File576.h"
+#import "File577.h"
+#import "File578.h"
+#import "File579.h"
+#import "File580.h"
+#import "File581.h"
+#import "File582.h"
+#import "File583.h"
+#import "File584.h"
+#import "File585.h"
+#import "File586.h"
+#import "File587.h"
+#import "File588.h"
+#import "File589.h"
+#import "File590.h"
+#import "File591.h"
+#import "File592.h"
+#import "File593.h"
+#import "File594.h"
+#import "File595.h"
+#import "File596.h"
+#import "File597.h"
+#import "File598.h"
+#import "File599.h"
+#import "File600.h"
+#import "File601.h"
+#import "File602.h"
+#import "File603.h"
+#import "File604.h"
+#import "File605.h"
+#import "File606.h"
+#import "File607.h"
+#import "File608.h"
+#import "File609.h"
+#import "File610.h"
+#import "File611.h"
+#import "File612.h"
+#import "File613.h"
+#import "File614.h"
+#import "File615.h"
+#import "File616.h"
+#import "File617.h"
+#import "File618.h"
+#import "File619.h"
+#import "File620.h"
+#import "File621.h"
+#import "File622.h"
+#import "File623.h"
+#import "File624.h"
+#import "File625.h"
+#import "File626.h"
+#import "File627.h"
+#import "File628.h"
+#import "File629.h"
+#import "File630.h"
+#import "File631.h"
+#import "File632.h"
+#import "File633.h"
+#import "File634.h"
+#import "File635.h"
+#import "File636.h"
+#import "File637.h"
+#import "File638.h"
+#import "File639.h"
+#import "File640.h"
+#import "File641.h"
+#import "File642.h"
+#import "File643.h"
+#import "File644.h"
+#import "File645.h"
+#import "File646.h"
+#import "File647.h"
+#import "File648.h"
+#import "File649.h"
+#import "File650.h"
+#import "File651.h"
+#import "File652.h"
+#import "File653.h"
+#import "File654.h"
+#import "File655.h"
+#import "File656.h"
+#import "File657.h"
+#import "File658.h"
+#import "File659.h"
+#import "File660.h"
+#import "File661.h"
+#import "File662.h"
+#import "File663.h"
+#import "File664.h"
+#import "File665.h"
+#import "File666.h"
+#import "File667.h"
+#import "File668.h"
+#import "File669.h"
+#import "File670.h"
+#import "File671.h"
+#import "File672.h"
+#import "File673.h"
+#import "File674.h"
+#import "File675.h"
+#import "File676.h"
+#import "File677.h"
+#import "File678.h"
+#import "File679.h"
+#import "File680.h"
+#import "File681.h"
+#import "File682.h"
+#import "File683.h"
+#import "File684.h"
+#import "File685.h"
+#import "File686.h"
+#import "File687.h"
+#import "File688.h"
+#import "File689.h"
+#import "File690.h"
+#import "File691.h"
+#import "File692.h"
+#import "File693.h"
+#import "File694.h"
+#import "File695.h"
+#import "File696.h"
+#import "File697.h"
+#import "File698.h"
+#import "File699.h"
+#import "File700.h"
+#import "File701.h"
+#import "File702.h"
+#import "File703.h"
+#import "File704.h"
+#import "File705.h"
+#import "File706.h"
+#import "File707.h"
+#import "File708.h"
+#import "File709.h"
+#import "File710.h"
+#import "File711.h"
+#import "File712.h"
+#import "File713.h"
+#import "File714.h"
+#import "File715.h"
+#import "File716.h"
+#import "File717.h"
+#import "File718.h"
+#import "File719.h"
+#import "File720.h"
+#import "File721.h"
+#import "File722.h"
+#import "File723.h"
+#import "File724.h"
+#import "File725.h"
+#import "File726.h"
+#import "File727.h"
+#import "File728.h"
+#import "File729.h"
+#import "File730.h"
+#import "File731.h"
+#import "File732.h"
+#import "File733.h"
+#import "File734.h"
+#import "File735.h"
+#import "File736.h"
+#import "File737.h"
+#import "File738.h"
+#import "File739.h"
+#import "File740.h"
+#import "File741.h"
+#import "File742.h"
+#import "File743.h"
+#import "File744.h"
+#import "File745.h"
+#import "File746.h"
+#import "File747.h"
+#import "File748.h"
+#import "File749.h"
+#import "File750.h"
+#import "File751.h"
+#import "File752.h"
+#import "File753.h"
+#import "File754.h"
+#import "File755.h"
+#import "File756.h"
+#import "File757.h"
+#import "File758.h"
+#import "File759.h"
+#import "File760.h"
+#import "File761.h"
+#import "File762.h"
+#import "File763.h"
+#import "File764.h"
+#import "File765.h"
+#import "File766.h"
+#import "File767.h"
+#import "File768.h"
+#import "File769.h"
+#import "File770.h"
+#import "File771.h"
+#import "File772.h"
+#import "File773.h"
+#import "File774.h"
+#import "File775.h"
+#import "File776.h"
+#import "File777.h"
+#import "File778.h"
+#import "File779.h"
+#import "File780.h"
+#import "File781.h"
+#import "File782.h"
+#import "File783.h"
+#import "File784.h"
+#import "File785.h"
+#import "File786.h"
+#import "File787.h"
+#import "File788.h"
+#import "File789.h"
+#import "File790.h"
+#import "File791.h"
+#import "File792.h"
+#import "File793.h"
+#import "File794.h"
+#import "File795.h"
+#import "File796.h"
+#import "File797.h"
+#import "File798.h"
+#import "File799.h"
+#import "File800.h"
+#import "File801.h"
+#import "File802.h"
+#import "File803.h"
+#import "File804.h"
+#import "File805.h"
+#import "File806.h"
+#import "File807.h"
+#import "File808.h"
+#import "File809.h"
+#import "File810.h"
+#import "File811.h"
+#import "File812.h"
+#import "File813.h"
+#import "File814.h"
+#import "File815.h"
+#import "File816.h"
+#import "File817.h"
+#import "File818.h"
+#import "File819.h"
+#import "File820.h"
+#import "File821.h"
+#import "File822.h"
+#import "File823.h"
+#import "File824.h"
+#import "File825.h"
+#import "File826.h"
+#import "File827.h"
+#import "File828.h"
+#import "File829.h"
+#import "File830.h"
+#import "File831.h"
+#import "File832.h"
+#import "File833.h"
+#import "File834.h"
+#import "File835.h"
+#import "File836.h"
+#import "File837.h"
+#import "File838.h"
+#import "File839.h"
+#import "File840.h"
+#import "File841.h"
+#import "File842.h"
+#import "File843.h"
+#import "File844.h"
+#import "File845.h"
+#import "File846.h"
+#import "File847.h"
+#import "File848.h"
+#import "File849.h"
+#import "File850.h"
+#import "File851.h"
+#import "File852.h"
+#import "File853.h"
+#import "File854.h"
+#import "File855.h"
+#import "File856.h"
+#import "File857.h"
+#import "File858.h"
+#import "File859.h"
+#import "File860.h"
+#import "File861.h"
+#import "File862.h"
+#import "File863.h"
+#import "File864.h"
+#import "File865.h"
+#import "File866.h"
+#import "File867.h"
+#import "File868.h"
+#import "File869.h"
+#import "File870.h"
+#import "File871.h"
+#import "File872.h"
+#import "File873.h"
+#import "File874.h"
+#import "File875.h"
+#import "File876.h"
+#import "File877.h"
+#import "File878.h"
+#import "File879.h"
+#import "File880.h"
+#import "File881.h"
+#import "File882.h"
+#import "File883.h"
+#import "File884.h"
+#import "File885.h"
+#import "File886.h"
+#import "File887.h"
+#import "File888.h"
+#import "File889.h"
+#import "File890.h"
+#import "File891.h"
+#import "File892.h"
+#import "File893.h"
+#import "File894.h"
+#import "File895.h"
+#import "File896.h"
+#import "File897.h"
+#import "File898.h"
+#import "File899.h"
+#import "File900.h"
+#import "File901.h"
+#import "File902.h"
+#import "File903.h"
+#import "File904.h"
+#import "File905.h"
+#import "File906.h"
+#import "File907.h"
+#import "File908.h"
+#import "File909.h"
+#import "File910.h"
+#import "File911.h"
+#import "File912.h"
+#import "File913.h"
+#import "File914.h"
+#import "File915.h"
+#import "File916.h"
+#import "File917.h"
+#import "File918.h"
+#import "File919.h"
+#import "File920.h"
+#import "File921.h"
+#import "File922.h"
+#import "File923.h"
+#import "File924.h"
+#import "File925.h"
+#import "File926.h"
+#import "File927.h"
+#import "File928.h"
+#import "File929.h"
+#import "File930.h"
+#import "File931.h"
+#import "File932.h"
+#import "File933.h"
+#import "File934.h"
+#import "File935.h"
+#import "File936.h"
+#import "File937.h"
+#import "File938.h"
+#import "File939.h"
+#import "File940.h"
+#import "File941.h"
+#import "File942.h"
+#import "File943.h"
+#import "File944.h"
+#import "File945.h"
+#import "File946.h"
+#import "File947.h"
+#import "File948.h"
+#import "File949.h"
+#import "File950.h"
+#import "File951.h"
+#import "File952.h"
+#import "File953.h"
+#import "File954.h"
+#import "File955.h"
+#import "File956.h"
+#import "File957.h"
+#import "File958.h"
+#import "File959.h"
+#import "File960.h"
+#import "File961.h"
+#import "File962.h"
+#import "File963.h"
+#import "File964.h"
+#import "File965.h"
+#import "File966.h"
+#import "File967.h"
+#import "File968.h"
+#import "File969.h"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_angle.m
index 259d2011..259d2011 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_oc_msg_receiver.m
index aad36be5..aad36be5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_before_oc_proto_list.m
index c0d96bdb..c0d96bdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_cond_ternary_short.m
index 6c1ce050..6c1ce050 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_cond_ternary_short.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_cond_ternary_short.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_inside_braces_oc_dict.m
index 272a2f28..272a2f28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_boxed.m
index 0c6948c0..0c6948c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_catch.m
index fe04844d..fe04844d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_classname_paren-r.m
index 1076bbb3..1076bbb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_synchronized.m
index e4de748b..e4de748b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/string.m
index f3fca80f..f3fca80f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ternary.m
index 3fdddd93..3fdddd93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/typeof.m
index d5183a1d..d5183a1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2586.pawn
index 89558691..89558691 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2665.pawn
index ddcb045a..ddcb045a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2665.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2665.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/comment.p
index 785521ac..785521ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/crusty_ex-1.sma
index 35ee0515..35ee0515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/enum.pawn
index 588efc35..588efc35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/functions.pawn
index cdda5e05..cdda5e05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/preproc.pawn
index e15d360e..e15d360e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/rpn_calc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/rpn_calc.pawn
index 2965d9c7..2965d9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/rpn_calc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/rpn_calc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/str-escape.p
index 5600eae3..5600eae3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/switch-vsemi.sma
index c2efacfb..c2efacfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/tags.pawn
index 56bdd2b9..56bdd2b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/test1.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/test1.pawn
index ecefe6e0..ecefe6e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/test1.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/test1.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/traffic.p
index f5cf0f7f..f5cf0f7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/unbraced.p
index 10c41663..10c41663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/issue_527.sqc
index 5514ff31..5514ff31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/mysql.sqc
index 197c2847..197c2847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/sta-select.sqc
index 863edf5b..863edf5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2090.vala
index 22698792..22698792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2270.vala
index 7bb897d8..7bb897d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/advanced.vala
index 2b85c031..2b85c031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/advanced.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/cast.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/cast.vala
index 77761b89..77761b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/cast.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/cast.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/gh287.vala
index fcb6fca6..fcb6fca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/vala/identifier.vala
new file mode 100644
index 00000000..5dee8d3b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/identifier.vala
@@ -0,0 +1,47 @@
+namespace ns
+{
+// You can omit '@' in trivial 'type func-name' definitions.
+void if() {
+}
+void else() {
+}
+void foreach() {
+}
+
+// Numeric identifiers require '@'.
+int @123star() {
+}
+
+// Non-primitive return types require '@'.
+Foo @while() {
+}
+}
+
+public static int main()
+{
+	// You can omit '@' in trivial 'type var;' declarations.
+	int for;
+	int while = 1;
+	int do;
+
+	// Non-primitive types always require '@'.
+	Foo @do;
+
+	// Slightly more complex 'type var_list;' require '@'.
+	int @if, @else, @for, @do, @while;
+
+	// This will complain about missing '(' etc.
+	// int if, else, for, do, while;
+
+	// It is common to omit '@' when accessing methods.
+	ns.if();
+	ns.else();
+	ns.do();
+	ns.while();
+	ns.foreach();
+
+	// Numeric methods always require '@'.
+	ns.@123star();
+
+	return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/list.vala
index e9b48acc..e9b48acc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.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.76.0/tests/input/vala/mdarray_space.vala
new file mode 100644
index 00000000..fa9eef2f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/mdarray_space.vala
@@ -0,0 +1,2 @@
+int[,,] x;
+var y = new int[2,3];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/nullable.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/nullable.vala
index 3d93d861..3d93d861 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/nullable.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/nullable.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/preproc.vala
index 3ab2ccc8..3ab2ccc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str.vala
index 11f19c01..11f19c01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str2.vala
index 9d8798b7..9d8798b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/java.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/java.test
index 9085dc14..9085dc14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/java.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/java.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/objective-c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/objective-c.test
index ee33f87a..84fea584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/objective-c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/objective-c.test
@@ -39,6 +39,7 @@
 50033  oc/mod_sort_incl_import_prioritize_extensionless.cfg     oc/sort_import.m
 50034  oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg oc/sort_import.m
 50035  oc/mod_sort_incl_import_grouping_enabled.cfg             oc/sort_import_group.m
+50036  oc/mod_sort_incl_import_grouping_enabled_with_regex.cfg  oc/sort_import_group_regex.mm
 
 50040  oc/objc_complex_method.cfg               oc/complex_method.m
 
@@ -140,6 +141,11 @@
 
 50630  oc/nl_func_call_args_multi_line_ignore_closures.cfg oc/nl_func_call_args_multi_line_ignore_closures.m
 
+50631  oc/nl_oc_msg_args_min_params.cfg         oc/nl_oc_msg_args_min_params.m
+50632  oc/nl_oc_msg_args_max_code_width.cfg     oc/nl_oc_msg_args_max_code_width.m
+
+50633  common/aet.cfg                           oc/ocpp_msg_access.mm
+
 50700  common/cmt_insert-0.cfg                  oc/cmt_insert.m
 50701  common/cmt_insert-0.cfg                  oc/cmt_insert2.m
 
@@ -171,6 +177,17 @@
 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
+50909  oc/3766.cfg                              oc/3766.m
+50910  oc/3767.cfg                              oc/3767.mm                          OC+
+50911  oc/3811.cfg                              oc/3811.mm                          OC+
+50912  oc/3812.cfg                              oc/3812.m
+50913  oc/3813.cfg                              oc/3813.m
+50914  oc/3819.cfg                              oc/3819.m
+50915  common/empty.cfg                         oc/3822.h
+50916  oc/3823.cfg                              oc/3823.m
+
 # test the options sp_ with the value "ignore"
 51000  oc/sp_cond_ternary_short.cfg             oc/sp_cond_ternary_short.m
 51001  oc/sp_enum_paren-i.cfg                   oc/ns_enum-i.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/pawn.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/pawn.test
index 7946465e..7946465e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/pawn.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/pawn.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_format_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_format_tests.py
index 671188c2..671188c2 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_format_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_format_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_sources_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_sources_tests.py
index ebbc6623..ebbc6623 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_sources_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_sources_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_test.py
index 7b5a9d57..7b5a9d57 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/staging.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/staging.test
index e71faddf..e71faddf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/staging.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/staging.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/__init__.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/__init__.py
index bf83b667..bf83b667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/__init__.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/__init__.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/ansicolor.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/ansicolor.py
index 44d6dbd5..44d6dbd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/ansicolor.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/ansicolor.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/config.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/config.py
index 4370816d..4370816d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/config.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/config.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/failure.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/failure.py
index 0972930f..0972930f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/failure.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/failure.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/selector.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/selector.py
index 93646257..93646257 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/selector.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/selector.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/test.py
index f621f40f..f621f40f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/utilities.py b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/utilities.py
index 8570e6d3..8570e6d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/utilities.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/utilities.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/tests.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/tests.vpj
index a5ed4fd3..a5ed4fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/tests.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/tests.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/vala.test b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/vala.test
index 26659b18..fa1ead91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/vala.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/vala.test
@@ -15,3 +15,8 @@
 70301  vala/Issue_2270.cfg                  vala/Issue_2270.vala
 70302  common/sp_after_cast.cfg             vala/cast.vala
 70303  vala/nullable.cfg                    vala/nullable.vala
+70304  common/empty.cfg                     vala/identifier.vala
+
+70310  vala/mda_space_a.cfg                 vala/mdarray_space.vala
+70311  vala/sp_after_comma-a.cfg            vala/mdarray_space.vala
+70312  vala/mda_space_c.cfg                 vala/mdarray_space.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpj
index 7f01a968..7f01a968 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpw b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpw
index 245d8153..245d8153 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpw
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpw
diff --git a/debian/uncrustify-trinity/uncrustify-trinity_0.75.0.orig.tar.gz b/debian/uncrustify-trinity/uncrustify-trinity_0.75.0.orig.tar.gz
deleted file mode 100644
index 63a0427a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity_0.75.0.orig.tar.gz
+++ /dev/null